diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-04-23 19:11:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:54:52 +0200 |
| commit | a7c6df6df0ef1b5fdc92ebb395ac11b82b66eb6f (patch) | |
| tree | 3fc1956eb896d1cf734fa61e9c669b3e2923967f | |
| parent | c064645bdf08977b3e17335747493aa53cb64daa (diff) | |
| download | ffmpeg-a7c6df6df0ef1b5fdc92ebb395ac11b82b66eb6f.tar.gz | |
avformat/avidec: fix position overflow in avi_load_index()
Fixes: signed integer overflow: 9223372033098784808 + 4294967072 cannot be represented in type 'long'
Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-6732488912273408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 527821a2dd6f19d9a4d2abe05833346ae86c66c6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 17adc94228..d56a1ba4f8 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1750,7 +1750,10 @@ static int avi_load_index(AVFormatContext *s) size = avio_rl32(pb); if (avio_feof(pb)) break; - next = avio_tell(pb) + size + (size & 1); + next = avio_tell(pb); + if (next < 0 || next > INT64_MAX - size - (size & 1)) + break; + next += size + (size & 1LL); if (tag == MKTAG('i', 'd', 'x', '1') && avi_read_idx1(s, size) >= 0) { |