diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-25 01:43:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:32 +0200 |
commit | f7e3422a8f74eaaa1df87b7712706e5ca7696c9b (patch) | |
tree | 968579ad690b645616d15b58dc3e1fb674938789 | |
parent | e28c0d48880027be7d15721c860f0a48bb4a4d87 (diff) | |
download | ffmpeg-f7e3422a8f74eaaa1df87b7712706e5ca7696c9b.tar.gz |
avcodec/pngdec: Fix runtime error: left shift of 152 by 24 places cannot be represented in type 'int'
Fixes: 666/clusterfuzz-testcase-6581447227867136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 310d2af319d9113263f75e94f5a1b211c05260b5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/pngdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index bb51b34a6a..4ab47a09d6 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -794,7 +794,7 @@ static int decode_trns_chunk(AVCodecContext *avctx, PNGDecContext *s, return AVERROR_INVALIDDATA; for (i = 0; i < length; i++) { - v = bytestream2_get_byte(&s->gb); + unsigned v = bytestream2_get_byte(&s->gb); s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); } } else if (s->color_type == PNG_COLOR_TYPE_GRAY || s->color_type == PNG_COLOR_TYPE_RGB) { |