virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

evrcdec: use memmove() instead of memcpy() when regions can overlap.

Browse Source 
This occurs also with valid files.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-18 16:19:10 +02:00
parent 90a56ebbe5
commit 5ae484e350
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/evrcdec.c
View File

@ -640,7 +640,7 @@ static void postfilter(EVRCContext *e, float *in, const float *coeff,
/* Short term postfilter */ /* Short term postfilter */
synthesis_filter(temp, wcoef2, e->postfilter_iir, length, out); 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)); 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]; 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) { if (e->bitrate != RATE_QUANT && e->avg_acb_gain < 0.4) {
f = 0.1 * e->avg_fcb_gain; 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); interpolate_delay(idelay, delay, e->prev_pitch_delay, i);
acb_excitation(e, e->pitch + ACB_SIZE, e->avg_acb_gain, idelay, subframe_size); 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]; 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, synthesis_filter(e->pitch + ACB_SIZE, ilpc,
e->synthesis, subframe_size, tmp); e->synthesis, subframe_size, tmp);