[FFmpeg-cvslog] avformat/concatdec: Check file
Michael Niedermayer
git at videolan.org
Thu May 9 18:10:33 EEST 2024
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Apr 30 00:47:31 2024 +0200| [a5d1497f33afa17b6a3578b66638e69bf8a558de] | committer: Michael Niedermayer
avformat/concatdec: Check file
Fixes: null pointer dereference
Fixes: -stream_loop 1 -ss 00:00:05 -i zgclab/ffmpeg_crash/poc2 -codec:v copy -codec:a aac -y output.mp4
Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5d1497f33afa17b6a3578b66638e69bf8a558de
---
libavformat/concatdec.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 493659649c..fe65d0c768 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -639,6 +639,11 @@ static int concat_parse_script(AVFormatContext *avf)
}
}
+ if (!file) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
if (file->inpoint != AV_NOPTS_VALUE && file->outpoint != AV_NOPTS_VALUE) {
if (file->inpoint > file->outpoint ||
file->outpoint - (uint64_t)file->inpoint > INT64_MAX)
More information about the ffmpeg-cvslog
mailing list