summaryrefslogtreecommitdiff
path: root/libavcodec/s302m.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-07 15:44:51 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-07 19:32:33 +0200
commita38e9797cb4123d13ba871d166a737786ba04a9b (patch)
tree99897a61218a28d2f9f476e37cf2047952eef342 /libavcodec/s302m.c
parent0ac1c87194a67e6104a3d241a4dd1ca0808784bd (diff)
avcodec/s302m: Fix left shift of 8 by 28 places cannot be represented in type 'int'
Fixes: 1395/clusterfuzz-testcase-minimized-5330939741732864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/s302m.c')
-rw-r--r--libavcodec/s302m.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c
index ccfb5913a0..a68ac79f2c 100644
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@@ -120,10 +120,10 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
if (avctx->bits_per_raw_sample == 24) {
uint32_t *o = (uint32_t *)frame->data[0];
for (; buf_size > 6; buf_size -= 7) {
- *o++ = (ff_reverse[buf[2]] << 24) |
+ *o++ = ((unsigned)ff_reverse[buf[2]] << 24) |
(ff_reverse[buf[1]] << 16) |
(ff_reverse[buf[0]] << 8);
- *o++ = (ff_reverse[buf[6] & 0xf0] << 28) |
+ *o++ = ((unsigned)ff_reverse[buf[6] & 0xf0] << 28) |
(ff_reverse[buf[5]] << 20) |
(ff_reverse[buf[4]] << 12) |
(ff_reverse[buf[3] & 0x0f] << 4);
@@ -142,10 +142,10 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
} else if (avctx->bits_per_raw_sample == 20) {
uint32_t *o = (uint32_t *)frame->data[0];
for (; buf_size > 5; buf_size -= 6) {
- *o++ = (ff_reverse[buf[2] & 0xf0] << 28) |
+ *o++ = ((unsigned)ff_reverse[buf[2] & 0xf0] << 28) |
(ff_reverse[buf[1]] << 20) |
(ff_reverse[buf[0]] << 12);
- *o++ = (ff_reverse[buf[5] & 0xf0] << 28) |
+ *o++ = ((unsigned)ff_reverse[buf[5] & 0xf0] << 28) |
(ff_reverse[buf[4]] << 20) |
(ff_reverse[buf[3]] << 12);
buf += 6;