eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 04:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/alac: Check for bps of 0

Browse Source 
Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int'
Fixes: 15764/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALAC_fuzzer-5102101203517440

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8f49176e84)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-08-09 01:23:49 +02:00
parent 505a44513f
commit 2bef13cc45
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/alac.c
View File

@@ -250,10 +250,12 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
alac->extra_bits = get_bits(&alac->gb, 2) << 3; alac->extra_bits = get_bits(&alac->gb, 2) << 3;
bps = alac->sample_size - alac->extra_bits + channels - 1; bps = alac->sample_size - alac->extra_bits + channels - 1;
if (bps > 32U) { if (bps > 32) {
avpriv_report_missing_feature(avctx, "bps %d", bps); avpriv_report_missing_feature(avctx, "bps %d", bps);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (bps < 1)
return AVERROR_INVALIDDATA;
/* whether the frame is compressed */ /* whether the frame is compressed */
is_compressed = !get_bits1(&alac->gb); is_compressed = !get_bits1(&alac->gb);