ffmpeg | branch: master | Thomas Guillem <tho...@gllm.fr> | Fri Apr 10 19:04:51 2015 +0200| [b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e] | committer: Anton Khirnov
matroskadec: fix crash when parsing invalid mkv CC: libav-sta...@libav.org Signed-off-by: Anton Khirnov <an...@khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e --- libavformat/matroskadec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7dac7be..93cd4bb 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1827,8 +1827,12 @@ static int matroska_read_header(AVFormatContext *s) matroska->ctx = s; /* First read the EBML header. */ - if (ebml_parse(matroska, ebml_syntax, &ebml) || - ebml.version > EBML_VERSION || + if (ebml_parse(matroska, ebml_syntax, &ebml) || !ebml.doctype) { + av_log(matroska->ctx, AV_LOG_ERROR, "EBML header parsing failed\n"); + ebml_free(ebml_syntax, &ebml); + return AVERROR_INVALIDDATA; + } + if (ebml.version > EBML_VERSION || ebml.max_size > sizeof(uint64_t) || ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 3) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
