ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Mon Oct 4 19:30:15 2021 +0200| [07e46690532a21faf29938e7a06f452a780f0361] | committer: Michael Niedermayer
avcodec/wmaprodec: Do not initialize unused variable to out of array value Fixes: out of array read Fixes: 39452/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA2_fuzzer-4678745030524928.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <one...@gmail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07e46690532a21faf29938e7a06f452a780f0361 --- libavcodec/wmaprodec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 7b489943f4..ba7bddc51c 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1932,11 +1932,12 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data, for (i = 0; i < s->num_streams; i++) { const int start_ch = s->start_channel[i]; void *left[1] = { frame->extended_data[start_ch + 0] }; - void *right[1] = { frame->extended_data[start_ch + 1] }; av_audio_fifo_read(s->samples[0][i], left, nb_samples); - if (s->xma[i].nb_channels > 1) + if (s->xma[i].nb_channels > 1) { + void *right[1] = { frame->extended_data[start_ch + 1] }; av_audio_fifo_read(s->samples[1][i], right, nb_samples); + } } *got_frame_ptr = nb_samples > 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
