diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 05:28:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 05:28:18 +0100 |
| commit | d9fe6b926cd619c311e45e0ae352cf09713c482c (patch) | |
| tree | fd3226948324d2851f52c520283d1a1790bcbc63 | |
| parent | b89f94077d85c33cac4a99ccfb024bbb284a8bab (diff) | |
| download | ffmpeg-d9fe6b926cd619c311e45e0ae352cf09713c482c.tar.gz | |
matroskadec: Fix null pointer exception on corrupted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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", |