diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-05 19:28:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 12:20:15 +0200 |
| commit | 9c7184ae63de0b4f36a9ad6f89e1102368db9ed1 (patch) | |
| tree | b9b8042426eb4166d99de1ebf91dba9dc544d0bd | |
| parent | 0f6f16392208f9ace447e1831cb50a3705f2fe12 (diff) | |
| download | ffmpeg-9c7184ae63de0b4f36a9ad6f89e1102368db9ed1.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>
(cherry picked from commit 0953736b7e97f6e121a0587a95434bf1857a27da)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/nellymoser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c index 027726e0ba..5ff6583c5e 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; } |