diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-21 04:29:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 19:45:45 +0200 |
| commit | b827d3a35230d7a3d523fea894352f58def38e03 (patch) | |
| tree | af7fa518d54982158ba0cd2657e8c035c789cde1 | |
| parent | 2dc487bcb08e98ca739c04a9b9bbd534217ebf52 (diff) | |
| download | ffmpeg-b827d3a35230d7a3d523fea894352f58def38e03.tar.gz | |
avcodec/exr: fix invalid shift in unpack_14()
Fixes: 6154/clusterfuzz-testcase-minimized-5762231061970944
Fixes: runtime error: shift exponent 63 is too large for 32-bit type 'int'
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 49062a90174b6e4104876c0257dc673a0da854ca)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/exr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 2f4b6ac08c..3c3b0d792f 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -892,7 +892,7 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src, static void unpack_14(const uint8_t b[14], uint16_t s[16]) { - unsigned short shift = (b[ 2] >> 2); + unsigned short shift = (b[ 2] >> 2) & 15; unsigned short bias = (0x20 << shift); int i; |