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

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Feb 28 12:35:18 2010 +0100| [4e66cf7dc1481b6f702e244351dbe4856ed97ef3] | committer: Rémi Denis-Courmont 

Fixed segfault with incomplete mkv files.

(cherry picked from commit 059a5785363ecf61de81ebf0e3628b5638b93d43)
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=4e66cf7dc1481b6f702e244351dbe4856ed97ef3
---

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

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index e510188..6fb4e82 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -635,7 +635,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
         mkv_track_t *p_tk = tracks[i_track];
         es_format_t *p_fmt = &p_tk->fmt;
 
-        if( tracks[i_track]->fmt.i_cat == UNKNOWN_ES )
+        if( p_fmt->i_cat == UNKNOWN_ES || !p_tk->psz_codec )
         {
             msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", (int)i_track, tracks[i_track]->i_number );
             tracks[i_track]->p_es = NULL;