diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-03 13:35:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-03 18:53:44 +0200 |
| commit | 9f6ca28e329e426eacbb82ad77aead13dfb9e8c6 (patch) | |
| tree | 41c3532e2c8225ec76e1c94d8a95f2574e048dcf /libavformat/concatdec.c | |
| parent | 5131ba565792828a44ff275ea4dd53300cc6f119 (diff) | |
avformat/concatdec: Check file variable before dereferencing
Fixes CID1322328
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 969b001551..88b6dbe6a4 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -394,6 +394,11 @@ static int concat_read_header(AVFormatContext *avf) av_log(avf, AV_LOG_ERROR, "Line %d: packet metadata required\n", line); FAIL(AVERROR_INVALIDDATA); } + if (!file) { + av_log(avf, AV_LOG_ERROR, "Line %d: %s without file\n", + line, keyword); + FAIL(AVERROR_INVALIDDATA); + } if ((ret = av_dict_parse_string(&file->metadata, metadata, "=", "", 0)) < 0) { av_log(avf, AV_LOG_ERROR, "Line %d: failed to parse metadata string\n", line); av_freep(&metadata); |