diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-05 19:28:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:17 +0200 |
| commit | e0defd45ac959ebe45c9f9dbee6734968aca952c (patch) | |
| tree | 451045e3391b098e2a242890288e6098904f3dc4 | |
| parent | 515514feeb86fc6e99a1924704e2cdb635063692 (diff) | |
| download | ffmpeg-e0defd45ac959ebe45c9f9dbee6734968aca952c.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 0740c75a0f..d6d5b7a910 100644 --- a/libavcodec/nellymoser.c +++ b/libavcodec/nellymoser.c @@ -85,7 +85,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; } @@ -109,7 +109,7 @@ static int headroom(int *la) return 31; } l = 30 - av_log2(FFABS(*la)); - *la <<= l; + *la *= 1<<l; return l; } |