aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-24 17:42:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-11 21:23:49 +0200
commitc65e5a1933427e35df0f58d0829f75de0cb2f037 (patch)
tree26563544e66dc5b00f37216e13dd3ddc0dd2fbc6
parent7a62ddb3cdfd63bd59f5d80a39b8f3a034ad7728 (diff)
downloadffmpeg-c65e5a1933427e35df0f58d0829f75de0cb2f037.tar.gz
avformat/mpc8: Check for position overflow in mpc8_handle_chunk()
Fixes: signed integer overflow: 15 + 9223372036854775796 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-6723520756318208 Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-6739833034768384 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 8ef25d118246bf443900033fb3588dba628d11b0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mpc8.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index e15d228e2c..1bada480fe 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -200,8 +200,11 @@ static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, in
switch(tag){
case TAG_SEEKTBLOFF:
- pos = avio_tell(pb) + size;
+ pos = avio_tell(pb);
off = ffio_read_varlen(pb);
+ if (pos > INT64_MAX - size || off < 0 || off > INT64_MAX - chunk_pos)
+ return;
+ pos += size;
mpc8_parse_seektable(s, chunk_pos + off);
avio_seek(pb, pos, SEEK_SET);
break;