]> git.sesse.net Git - vlc/commitdiff
Fixed segfault with corrupted mkv files with compressed data.
authorLaurent Aimar <fenrir@videolan.org>
Sat, 27 Feb 2010 21:57:50 +0000 (22:57 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Sat, 27 Feb 2010 23:27:09 +0000 (00:27 +0100)
modules/demux/mkv/mkv.cpp

index 3624371ac6aa5ae22fe634e6914dadbb3768120e..1f9fbf97b5ec430a84fdcf736267c30a142626cc 100644 (file)
@@ -551,6 +551,8 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simp
         if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB )
         {
             p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block );
+            if( p_block == NULL )
+                break;
         }
         else
 #endif