Skip to content
Snippets Groups Projects
Commit b8d7f318 authored by Thomas Guillem's avatar Thomas Guillem Committed by Anton Khirnov
Browse files

matroskadec: fix crash when parsing invalid mkv


CC: libav-stable@libav.org

Signed-off-by: default avatarAnton Khirnov <anton@khirnov.net>
parent 1336bb06
No related branches found
No related tags found
No related merge requests found
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment