aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-17 23:15:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-09-26 16:50:59 +0200
commit2cdc8254ebdc6e37bff73629a0065129c1d47d03 (patch)
tree4a3e9cc53368c0d779cb199aea0f61386d105002
parentb591a55e7a7bd32938fb9375e6169a205381db38 (diff)
downloadffmpeg-2cdc8254ebdc6e37bff73629a0065129c1d47d03.tar.gz
avformat/icodec: Check nb_pal
Fixes: signed integer overflow: 538976288 * 4 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_ICO_fuzzer-6690068904935424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit db73ae0dc114aa6fae08e69f977944f056a24995) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/icodec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/icodec.c b/libavformat/icodec.c
index 93179bb41e..b321ad6007 100644
--- a/libavformat/icodec.c
+++ b/libavformat/icodec.c
@@ -203,6 +203,9 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
AV_WL32(buf + 32, image->nb_pal);
}
+ if (image->nb_pal > INT_MAX / 4 - 14 - 40)
+ return AVERROR_INVALIDDATA;
+
AV_WL32(buf - 4, 14 + 40 + image->nb_pal * 4);
AV_WL32(buf + 8, AV_RL32(buf + 8) / 2);
}