diff options
| author | Thomas Guillem <thomas@gllm.fr> | 2015-04-10 19:04:51 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-04-18 17:06:07 +0200 |
| commit | bac0850fbf870d4354d0f68840c0b1c9c1425c4a (patch) | |
| tree | 303f7ce59ac8bce40b195ba92e6c6c32f3d18dbc | |
| parent | 8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c (diff) | |
| download | ffmpeg-bac0850fbf870d4354d0f68840c0b1c9c1425c4a.tar.gz | |
matroskadec: fix crash when parsing invalid mkv
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 3e1c9da38b849ce2982b516004370081fdd89ed0)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavformat/matroskadec.c
| -rw-r--r-- | libavformat/matroskadec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 22902e0ef7..ad83af4b11 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1412,8 +1412,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 || ebml.max_size > sizeof(uint64_t) + 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 > 2) { av_log(matroska->ctx, AV_LOG_ERROR, "EBML header using unsupported features\n" |