[vlc-commits] commit: Fixed segfault with corrupted mkv files with compressed data. ( Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Feb 27 22:57:50 2010 +0100| [ca13e21cc5c948908f618cc4a76443bd30e5658c] | committer: Rémi Denis-Courmont 

Fixed segfault with corrupted mkv files with compressed data.

(cherry picked from commit 34500c14bf7d9e58a62ff0f0d6a98ec4a9cf4e91)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=ca13e21cc5c948908f618cc4a76443bd30e5658c
---

 modules/demux/mkv/mkv.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 102a807..f2c2a75 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -549,6 +549,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