diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-18 16:19:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-18 16:20:49 +0200 |
commit | 5ae484e350e4f1b20b31802dac59ca3519627c0a (patch) | |
tree | 178614554ed8e07d472260ba6b5c1c8a18786ce2 /libavcodec/evrcdec.c | |
parent | 90a56ebbe586f659ca33292e1a915cc66dff47ff (diff) | |
download | ffmpeg-5ae484e350e4f1b20b31802dac59ca3519627c0a.tar.gz |
evrcdec: use memmove() instead of memcpy() when regions can overlap.
This occurs also with valid files.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/evrcdec.c')
-rw-r--r-- | libavcodec/evrcdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 76914554d4..f0e594fdde 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -640,7 +640,7 @@ static void postfilter(EVRCContext *e, float *in, const float *coeff, /* Short term postfilter */ synthesis_filter(temp, wcoef2, e->postfilter_iir, length, out); - memcpy(e->postfilter_residual, + memmove(e->postfilter_residual, e->postfilter_residual + length, ACB_SIZE * sizeof(float)); } @@ -714,7 +714,7 @@ static void frame_erasure(EVRCContext *e, float *samples) e->pitch[ACB_SIZE + j] = e->energy_vector[i]; } - memcpy(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); + memmove(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); if (e->bitrate != RATE_QUANT && e->avg_acb_gain < 0.4) { f = 0.1 * e->avg_fcb_gain; @@ -814,7 +814,7 @@ static int evrc_decode_frame(AVCodecContext *avctx, void *data, interpolate_delay(idelay, delay, e->prev_pitch_delay, i); acb_excitation(e, e->pitch + ACB_SIZE, e->avg_acb_gain, idelay, subframe_size); - memcpy(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); + memmove(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); } } @@ -872,7 +872,7 @@ static int evrc_decode_frame(AVCodecContext *avctx, void *data, e->pitch[ACB_SIZE + j] = e->energy_vector[i]; } - memcpy(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); + memmove(e->pitch, e->pitch + subframe_size, ACB_SIZE * sizeof(float)); synthesis_filter(e->pitch + ACB_SIZE, ilpc, e->synthesis, subframe_size, tmp); |