Module: libav Branch: release/11 Commit: 3e1c9da38b849ce2982b516004370081fdd89ed0
Author: Thomas Guillem <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Apr 10 19:04:51 2015 +0200 matroskadec: fix crash when parsing invalid mkv CC: [email protected] Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e) Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/matroskadec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f384458..67df4b34 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1825,8 +1825,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) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
