[FFmpeg-cvslog] oavformat/avidec: Check offset in odml
Michael Niedermayer
git at videolan.org
Sun Oct 17 01:41:29 EEST 2021
ffmpeg | branch: release/4.1 | Michael Niedermayer <michael at niedermayer.cc> | Sun Sep 19 21:51:28 2021 +0200| [186222fa567e7e361b9a497d810a0c4c5241c50b] | committer: Michael Niedermayer
oavformat/avidec: Check offset in odml
Fixes: signed integer overflow: 9223372036854775807 + 8 cannot be represented in type 'long'
Fixes: 38787/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-4859845799444480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 255a7b423ed5e07536bdc72e993056daa4efe009)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=186222fa567e7e361b9a497d810a0c4c5241c50b
---
libavformat/avidec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index b1c0325a19..f588e971ea 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -236,7 +236,7 @@ static int read_odml_index(AVFormatContext *s, int64_t frame_num)
avio_rl32(pb); /* size */
duration = avio_rl32(pb);
- if (avio_feof(pb))
+ if (avio_feof(pb) || offset > INT64_MAX - 8)
return AVERROR_INVALIDDATA;
pos = avio_tell(pb);
More information about the ffmpeg-cvslog
mailing list