From d9fe6b926cd619c311e45e0ae352cf09713c482c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 16 Mar 2012 05:28:18 +0100 Subject: [PATCH] matroskadec: Fix null pointer exception on corrupted input. Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d3f6a3ed7c..dbe2815a9c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1377,7 +1377,7 @@ static int matroska_read_header(AVFormatContext *s) /* First read the EBML header. */ if (ebml_parse(matroska, ebml_syntax, &ebml) || ebml.version > EBML_VERSION || ebml.max_size > sizeof(uint64_t) - || ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 3) { + || ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 3 || !ebml.doctype) { av_log(matroska->ctx, AV_LOG_ERROR, "EBML header using unsupported features\n" "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",