[FFmpeg-cvslog] avcodec/exr: fix invalid shift in unpack_14()
Michael Niedermayer
git at videolan.org
Tue Feb 27 20:38:17 EET 2018
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Feb 21 04:29:44 2018 +0100| [49062a90174b6e4104876c0257dc673a0da854ca] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49062a90174b6e4104876c0257dc673a0da854ca
---
libavcodec/exr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 444af17778..5253cc3f13 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -899,7 +899,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;
More information about the ffmpeg-cvslog
mailing list