diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-05 19:28:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | cd6c4082db7659409c0672f68318559a6eb62b3d (patch) | |
| tree | 44849dddaec8c77dfd959e4a9553cb63ccdda6ce | |
| parent | 3366d18c29a85fdf60e60ed634606620ddd132fe (diff) | |
| download | ffmpeg-cd6c4082db7659409c0672f68318559a6eb62b3d.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; } |