summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-13 01:35:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-14 17:27:52 +0200
commit9b762642418f85874fc09df544eed92644e37236 (patch)
tree0798b6afc4f0380373678ebe1f3729d591be7624
parent36847fd7f1e02e54c75f96417d974ba1cd16e8c0 (diff)
downloadffmpeg-9b762642418f85874fc09df544eed92644e37236.tar.gz
avcodec/dds: Fix runtime error: left shift of 210 by 24 places cannot be represented in type 'int'
Fixes: 1510/clusterfuzz-testcase-minimized-5826231746428928 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 afb4632cc30e83287338690c785ebac180436a59) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index 7d0043f6ec..02d53d5835 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -722,7 +722,7 @@ static int dds_decode(AVCodecContext *avctx, void *data,
(frame->data[1][2+i*4]<<0)+
(frame->data[1][1+i*4]<<8)+
(frame->data[1][0+i*4]<<16)+
- (frame->data[1][3+i*4]<<24)
+ ((unsigned)frame->data[1][3+i*4]<<24)
);
frame->palette_has_changed = 1;