aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-29 13:51:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-16 01:05:28 +0200
commit9f8da7e2aa6224fd4792c231d15076fb8d3a7c49 (patch)
treec66bc367d9b39e75f7a9201232b2673c57117d44
parent1d4199e02311592dd4ea3077d07b3ad1eda91bf4 (diff)
downloadffmpeg-9f8da7e2aa6224fd4792c231d15076fb8d3a7c49.tar.gz
avcodec/dds: Fix runtime error: left shift of 145 by 24 places cannot be represented in type 'int'
Fixes: 1891/clusterfuzz-testcase-minimized-6274417925554176 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 c49fa2a51452eeba0cf2c14ce999ddeadf69aa4f) 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 02d53d5835..a3ec8fcd5f 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -691,7 +691,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;