diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-13 20:45:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-16 16:00:22 +0200 |
| commit | f4b8e7f2c692f8d9d06d107e8f042a8523c3be6c (patch) | |
| tree | d442eb10a2a2ca6a10260d01aa899958a7c4f011 | |
| parent | 139a5390623b01453ce6fe9aab913200844a25a9 (diff) | |
| download | ffmpeg-f4b8e7f2c692f8d9d06d107e8f042a8523c3be6c.tar.gz | |
avcodec/mpegaudiodec_template: Make l3_unscale() work with e=0
Fixes undefined behavior
Fixes: 830/clusterfuzz-testcase-6253175327686656
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 8ebed703f153e979edb2156754c8bdac4d5d6266)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index ffd680b34f..37b1af9bd9 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -253,7 +253,7 @@ static inline int l3_unscale(int value, int exponent) #endif if (e > 31) return 0; - m = (m + (1 << (e - 1))) >> e; + m = (m + ((1U << e)>>1)) >> e; return m; } |