From cd4739c4f2d7ed56405f40dffe6254f6275e6e41 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 12 Jul 2012 13:38:50 +0200 Subject: [PATCH] matroska: honor error_recognition on unknown doctypes --- libavformat/matroskadec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7792b4c52a..95130fc4df 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1346,6 +1346,10 @@ static int matroska_read_header(AVFormatContext *s) break; if (i >= FF_ARRAY_ELEMS(matroska_doctypes)) { av_log(s, AV_LOG_WARNING, "Unknown EBML doctype '%s'\n", ebml.doctype); + if (matroska->ctx->error_recognition & AV_EF_EXPLODE) { + ebml_free(ebml_syntax, &ebml); + return AVERROR_INVALIDDATA; + } } ebml_free(ebml_syntax, &ebml);