summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-05 13:02:22 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-05 13:36:52 +0200
commit1f5b6c7e1ee604b1525b3ab84ea6e8817fe66f36 (patch)
treee9caf6b6a548a62b8c280b3ea7e36945893f93df /libavcodec
parentce551a3925a1cf9c7824e26a246b99b6773bda4b (diff)
downloadffmpeg-streaming-1f5b6c7e1ee604b1525b3ab84ea6e8817fe66f36.zip
ffmpeg-streaming-1f5b6c7e1ee604b1525b3ab84ea6e8817fe66f36.tar.gz
avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'
Fixes: 1336/clusterfuzz-testcase-minimized-4761381930795008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pixlet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index c4f7597..d031305 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -154,7 +154,7 @@ static int read_low_coeffs(AVCodecContext *avctx, int16_t *dst, int size, int wi
state = 120 * (escape + flag) + state - (120 * state >> 8);
flag = 0;
- if (state * 4 > 0xFF || i >= size)
+ if (state * 4ULL > 0xFF || i >= size)
continue;
nbits = ((state + 8) >> 5) + (state ? ff_clz(state) : 32) - 24;
@@ -260,7 +260,7 @@ static int read_high_coeffs(AVCodecContext *avctx, uint8_t *src, int16_t *dst, i
flag = 0;
- if (state * 4 > 0xFF || i >= size)
+ if (state * 4ULL > 0xFF || i >= size)
continue;
pfx = ((state + 8) >> 5) + (state ? ff_clz(state): 32) - 24;
OpenPOWER on IntegriCloud