diff mbox

[FFmpeg-devel,1/3] avcodec/flacdec: avoid undefined shift

Message ID 20171226222445.20277-1-michael@niedermayer.cc
State Accepted
Commit 560daf88913b0de59a4d845bcd19254b406388dd
Headers show

Commit Message

Michael Niedermayer Dec. 26, 2017, 10:24 p.m. UTC 
Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int'
Fixes: 4688/clusterfuzz-testcase-minimized-6572210748653568

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/flacdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Dec. 28, 2017, 6:24 p.m. UTC | #1 
On Tue, Dec 26, 2017 at 11:24:43PM +0100, Michael Niedermayer wrote:
> Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int'
> Fixes: 4688/clusterfuzz-testcase-minimized-6572210748653568
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/flacdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

patchset applied

[...]
diff mbox

Patch

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 6c8ba15777..64bea76f98 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -460,7 +460,7 @@  static inline int decode_subframe(FLACContext *s, int channel)
         return AVERROR_INVALIDDATA;
     }
 
-    if (wasted) {
+    if (wasted && wasted < 32) {
         int i;
         for (i = 0; i < s->blocksize; i++)
             decoded[i] = (unsigned)decoded[i] << wasted;