diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-21 04:29:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-04-13 00:35:15 +0200 |
| commit | 4d45d5b606a11f6f401d7694df08e7e47989af32 (patch) | |
| tree | 0f8933aaedb054d04292cdd986a7fbd4ba97a7e1 | |
| parent | 5909508e8df3bd762efc0dbd10b5e5a16ed2993e (diff) | |
| download | ffmpeg-4d45d5b606a11f6f401d7694df08e7e47989af32.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 b27132d6bb..2481959a21 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -910,7 +910,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; |