generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: fix crash when parsing invalid mkv

Browse Source 
CC: libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Thomas Guillem 2015-04-10 19:04:51 +02:00 committed by Anton Khirnov
parent 1336bb06c9
commit b8d7f3186e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/matroskadec.c
View File

@ -1827,8 +1827,12 @@ static int matroska_read_header(AVFormatContext *s)
matroska->ctx = s; matroska->ctx = s;
/* First read the EBML header. */ /* First read the EBML header. */
if (ebml_parse(matroska, ebml_syntax, &ebml) || if (ebml_parse(matroska, ebml_syntax, &ebml) || !ebml.doctype) {
ebml.version > EBML_VERSION || 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.max_size > sizeof(uint64_t) ||
ebml.id_length > sizeof(uint32_t) || ebml.id_length > sizeof(uint32_t) ||
ebml.doctype_version > 3) { ebml.doctype_version > 3) {