| Message ID | 20240326001151.12083-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 007486058c2eb7a7518450a2ddb4fa98845887a3 |
| Headers | show |
| Series | [FFmpeg-devel,01/10] avformat/concatdec: Check user_duration sum | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Tue, Mar 26, 2024 at 01:11:42AM +0100, Michael Niedermayer wrote: > Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-6434245599690752 > Fixes: signed integer overflow: 9223372026773000000 + 22337000000 cannot be represented in type 'long' > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/concatdec.c | 2 ++ > 1 file changed, 2 insertions(+) if there are no objections i will apply this patchset before making the 7.0 branch [...]
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index ac541a592fa..f1401e43530 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -679,6 +679,8 @@ static int concat_read_header(AVFormatContext *avf) cat->files[i].user_duration = cat->files[i].outpoint - cat->files[i].inpoint; } cat->files[i].duration = cat->files[i].user_duration; + if (time + (uint64_t)cat->files[i].user_duration > INT64_MAX) + return AVERROR_INVALIDDATA; time += cat->files[i].user_duration; } if (i == cat->nb_files) {
Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-6434245599690752 Fixes: signed integer overflow: 9223372026773000000 + 22337000000 cannot be represented in type 'long' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/concatdec.c | 2 ++ 1 file changed, 2 insertions(+)