| Message ID | 20221121235823.28468-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | aa79560de5e9596ada0345e5d12aa00dbeddaaa6 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avutil/tx: Use unsigned in ff_tx_fft_sr_combine() to avoid undefined behavior | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 0b0eb75990..5b14a3b03b 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -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 * 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, "%d channels (more than the " "maximum supported by the decoder)",
This is a regression since: adaa06581c5444c94eef72d61b8166f096e2687a 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> --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)