diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-08-04 22:42:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-08-06 00:38:09 +0200 |
| commit | 5036d7b20cf2af7e30dd3e8785b045aad0b8bbe7 (patch) | |
| tree | a67a5d9521576c4a0baeff4f8c56dbbc420300c8 /libavcodec/jpeg2000.h | |
| parent | 5508e7bf8a2aa49fc75813e00f021843637fdf04 (diff) | |
avcodec/jpeg2000dec: Handle reducedresno of 32
Fixes: shift exponent 32 is too large for 32-bit type 'int'
Fixes: 24566/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6033783737024512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Gautam Ramakrishnan <gautamramk@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000.h')
| -rw-r--r-- | libavcodec/jpeg2000.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 27df43786d..5b0627c3dc 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -220,9 +220,9 @@ static inline int ff_jpeg2000_ceildivpow2(int a, int b) return -((-(int64_t)a) >> b); } -static inline int ff_jpeg2000_ceildiv(int a, int b) +static inline int ff_jpeg2000_ceildiv(int a, int64_t b) { - return (a + (int64_t)b - 1) / b; + return (a + b - 1) / b; } /* TIER-1 routines */ |