diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-26 23:24:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-28 15:31:14 +0100 |
| commit | fb9560b366da69bd54011455c0c35303669e7ce6 (patch) | |
| tree | 0be9e4f481e1cd54e9e18cb276576b384d1266f7 | |
| parent | 0e7d8ce37c2fd543bde32914ddb7ce54fc2f9220 (diff) | |
| download | ffmpeg-fb9560b366da69bd54011455c0c35303669e7ce6.tar.gz | |
avcodec/flacdec: avoid undefined shift
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>
(cherry picked from commit 560daf88913b0de59a4d845bcd19254b406388dd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 581c73efc8..5bbb8ee5b9 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -456,7 +456,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; |