You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avcodec/mlpdec: Check max matrix instead of max channel in noise check
This is a regression since: adaa06581c
Before this, max_channel and max_matrix_channel where compared for equality
Fixes: out of array access
Fixes: 53340/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-514959011885875
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
@@ -539,7 +539,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
|
|||||||
|
|
||||||
/* This should happen for TrueHD streams with >6 channels and MLP's noise
|
/* This should happen for TrueHD streams with >6 channels and MLP's noise
|
||||||
* type. It is not yet known if this is allowed. */
|
* type. It is not yet known if this is allowed. */
|
||||||
if (max_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) {
|
if (max_matrix_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) {
|
||||||
avpriv_request_sample(m->avctx,
|
avpriv_request_sample(m->avctx,
|
||||||
"%d channels (more than the "
|
"%d channels (more than the "
|
||||||
"maximum supported by the decoder)",
|
"maximum supported by the decoder)",
|
||||||
|
Reference in New Issue
Block a user