summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-05 19:28:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-05 19:29:32 +0200
commit0953736b7e97f6e121a0587a95434bf1857a27da (patch)
treea0d1e75cbd2700318df934432e3529d95fc23c7e
parent1002932a3b16d35c46a08455f76462909eebb5aa (diff)
downloadffmpeg-streaming-0953736b7e97f6e121a0587a95434bf1857a27da.zip
ffmpeg-streaming-0953736b7e97f6e121a0587a95434bf1857a27da.tar.gz
avcodec/nellymoser: Fix multiple left shift of negative value -8591
Fixes: 1342/clusterfuzz-testcase-minimized-5490842129137664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/nellymoser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 027726e..5ff6583 100644
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -84,7 +84,7 @@ const int16_t ff_nelly_delta_table[32] = {
static inline int signed_shift(int i, int shift) {
if (shift > 0)
- return i << shift;
+ return (unsigned)i << shift;
return i >> -shift;
}
@@ -108,7 +108,7 @@ static int headroom(int *la)
return 31;
}
l = 30 - av_log2(FFABS(*la));
- *la <<= l;
+ *la *= 1<<l;
return l;
}
OpenPOWER on IntegriCloud