[FFmpeg-cvslog] avformat/concatdec: Check file variable before dereferencing

Michael Niedermayer git at videolan.org
Thu Sep 3 19:24:22 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep  3 13:35:37 2015 +0200| [9f6ca28e329e426eacbb82ad77aead13dfb9e8c6] | committer: Michael Niedermayer

avformat/concatdec: Check file variable before dereferencing

Fixes CID1322328

Reviewed-by: Ganesh Ajjanagadde <gajjanag at mit.edu>
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f6ca28e329e426eacbb82ad77aead13dfb9e8c6
---

 libavformat/concatdec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 969b001..88b6dbe 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);



More information about the ffmpeg-cvslog mailing list