aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpc8.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-03-17 21:58:53 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-03-31 23:09:35 +0200
commit6cc65d3d6760cfb08c5a9e57d4306d88428e18d0 (patch)
treeae1d3a92327c96277e6c5c350e95987945ca9401 /libavformat/mpc8.c
parentc1fe1114bc4c2f6da764f0eca792cf03c82c3422 (diff)
downloadffmpeg-6cc65d3d6760cfb08c5a9e57d4306d88428e18d0.tar.gz
avformat/mpc8: check for size overflow in mpc8_get_chunk_header()
Fixes: signed integer overflow: -9223372036854775760 - 50 cannot be represented in type 'long' Fixes: 31673/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-580134751869337 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpc8.c')
-rw-r--r--libavformat/mpc8.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index ff7da2ef55..b12a417f63 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -127,7 +127,11 @@ static void mpc8_get_chunk_header(AVIOContext *pb, int *tag, int64_t *size)
pos = avio_tell(pb);
*tag = avio_rl16(pb);
*size = ffio_read_varlen(pb);
- *size -= avio_tell(pb) - pos;
+ pos -= avio_tell(pb);
+ if (av_sat_add64(*size, pos) != (uint64_t)*size + pos) {
+ *size = -1;
+ } else
+ *size += pos;
}
static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)