diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-03-02 20:07:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-11 21:23:49 +0200 |
| commit | 5e01c257411364511a5259d51a21fec0ffbe7575 (patch) | |
| tree | c7e89a4234d7540dc3c809da66d0dae768b31711 | |
| parent | fcc7bc3cd5df67cc30aa5685c3b9424001690fd9 (diff) | |
| download | ffmpeg-5e01c257411364511a5259d51a21fec0ffbe7575.tar.gz | |
avcodec/jpegls: Check A[Q] for overflow in ff_jpegls_update_state_regular()
Fixes: Timeout
Fixes: 30912/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5556235476795392
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 8a3fea802a3e4274dbe084d372ec8aeab3932b3e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/jpegls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index c8997c7861..060ded9df8 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -97,7 +97,7 @@ static inline void ff_jpegls_downscale_state(JLSState *state, int Q) static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err) { - if(FFABS(err) > 0xFFFF) + if(FFABS(err) > 0xFFFF || FFABS(err) > INT_MAX - state->A[Q]) return -0x10000; state->A[Q] += FFABS(err); err *= state->twonear; |