| Message ID | 20200621223619.1797-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | cf0c700b0c25f5d9fe50dd27086a06812822f11a |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/avidec: Fix io_fsize overflow | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Mon, Jun 22, 2020 at 12:36:18AM +0200, Michael Niedermayer wrote: > Fixes: signed integer overflow: 7958120835074169528 * 9 cannot be represented in type 'long long' > Fixes: 23382/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6230683226996736 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/avidec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply patchset [...]
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 5fc3e01aa9..df677a1618 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -439,7 +439,7 @@ static int calculate_bitrate(AVFormatContext *s) maxpos = FFMAX(maxpos, st->index_entries[j-1].pos); lensum += len; } - if (maxpos < avi->io_fsize*9/10) // index does not cover the whole file + if (maxpos < av_rescale(avi->io_fsize, 9, 10)) // index does not cover the whole file return 0; if (lensum*9/10 > maxpos || lensum < maxpos*9/10) // frame sum and filesize mismatch return 0;
Fixes: signed integer overflow: 7958120835074169528 * 9 cannot be represented in type 'long long' Fixes: 23382/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6230683226996736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)