aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer2018-07-14 00:24:47 +0200
committerMichael Niedermayer2018-07-15 19:42:25 +0200
commit7334985ffae8067b84884b5bd345db06fe2cc220 (patch)
tree089f2509b0c20b2db655598ff0155261f1ba78d8
parent5d8df3cc4ac089bb6ed47b944f30f0e2cf9ceb19 (diff)
libavcodec/cfhd: Fix signed overflow in shift
Fixes: 8695/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-4906172426485760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/cfhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index 051d210355..ef5ebe42c5 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -541,7 +541,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
s->peak.level = 0;
} else if (tag == -76) {
s->peak.offset &= 0xffff;
- s->peak.offset |= (data & 0xffff)<<16;
+ s->peak.offset |= (data & 0xffffU)<<16;
s->peak.base = (int16_t *) gb.buffer;
s->peak.level = 0;
} else if (tag == -74 && s->peak.offset) {