diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-17 11:54:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:56 +0100 |
| commit | 81672bf00f3b5a3c025034f4b2e33d67b72f3839 (patch) | |
| tree | d37c165380ee9c4bd91a3350b6d0eb4d280eb5ca | |
| parent | b97aaf791f6ea3506a6252ecef6a1a0e9a542e04 (diff) | |
| download | ffmpeg-81672bf00f3b5a3c025034f4b2e33d67b72f3839.tar.gz | |
avcodec/g729dec: Avoid computing invalid temporary pointers for ff_acelp_weighted_vector_sum()
Fixes: Ticket8176
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2c78a76cb0443f8a12a5eadc3b58373aa2f4ab22)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/g729dec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 2e4756b805..888abafcc0 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -552,12 +552,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, fc_v[i] = < \ fc_v[i] + gain_pitch * fc_v[i-pitch_delay], i >= pitch_delay */ - ff_acelp_weighted_vector_sum(fc + pitch_delay_int[i], - fc + pitch_delay_int[i], - fc, 1 << 14, - av_clip(ctx->past_gain_pitch[0], SHARP_MIN, SHARP_MAX), - 0, 14, - SUBFRAME_SIZE - pitch_delay_int[i]); + if (SUBFRAME_SIZE > pitch_delay_int[i]) + ff_acelp_weighted_vector_sum(fc + pitch_delay_int[i], + fc + pitch_delay_int[i], + fc, 1 << 14, + av_clip(ctx->past_gain_pitch[0], SHARP_MIN, SHARP_MAX), + 0, 14, + SUBFRAME_SIZE - pitch_delay_int[i]); memmove(ctx->past_gain_pitch+1, ctx->past_gain_pitch, 5 * sizeof(int16_t)); ctx->past_gain_code[1] = ctx->past_gain_code[0]; |