RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/speexdec: Avoid violating the vector_fmul_scalar() API

Browse Source 
Fixes: out of array access
Fixes: 40054/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-6713285764841472

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:
Michael Niedermayer 2021-11-30 20:03:22 +01:00
parent 562021e2fd
commit 8e96410e1b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/speexdec.c
View File

@ -1545,7 +1545,7 @@ static int speex_decode_frame(AVCodecContext *avctx, void *data,
if ((ret = init_get_bits8(&s->gb, avpkt->data, buf_size)) < 0) if ((ret = init_get_bits8(&s->gb, avpkt->data, buf_size)) < 0)
return ret; return ret;
frame->nb_samples = s->frame_size * s->frames_per_packet; frame->nb_samples = FFALIGN(s->frame_size * s->frames_per_packet, 4);
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret; return ret;
@ -1560,6 +1560,7 @@ static int speex_decode_frame(AVCodecContext *avctx, void *data,
dst = (float *)frame->extended_data[0]; dst = (float *)frame->extended_data[0];
s->fdsp->vector_fmul_scalar(dst, dst, scale, frame->nb_samples * frame->channels); s->fdsp->vector_fmul_scalar(dst, dst, scale, frame->nb_samples * frame->channels);
frame->nb_samples = s->frame_size * s->frames_per_packet;
*got_frame_ptr = 1; *got_frame_ptr = 1;