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

git version control git at videolan.org
Sun Feb 28 00:27:39 CET 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Feb 27 22:57:50 2010 +0100| [34500c14bf7d9e58a62ff0f0d6a98ec4a9cf4e91] | committer: Laurent Aimar 

Fixed segfault with corrupted mkv files with compressed data.

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

 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 3624371..1f9fbf9 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -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




More information about the vlc-devel mailing list