mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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@niedermayer.cc>
This commit is contained in:
parent
24bd01ea65
commit
a5d1497f33
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user