diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-18 17:54:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 00:35:12 +0100 |
| commit | a92b73da9907cc6819b5a476747a5ab44c797c88 (patch) | |
| tree | bbde28e584a008e42fc8b34fe986367be66e31e8 | |
| parent | ab38b390592df4ad941b8e7568b8dd7f0aa521ca (diff) | |
| download | ffmpeg-a92b73da9907cc6819b5a476747a5ab44c797c88.tar.gz | |
svq3: use memmove to avoid overlap in memcpy.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4c8ce750abaa783109630d41ca7dde5de34f6197)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/svq3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 0481c807ab..3c17e0fc68 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -790,8 +790,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) header ^ s->watermark_key); } if (length > 0) { - memcpy((uint8_t *) &h->gb.buffer[get_bits_count(&h->gb) >> 3], - &h->gb.buffer[h->gb.size_in_bits >> 3], length - 1); + memmove((uint8_t *) &h->gb.buffer[get_bits_count(&h->gb) >> 3], + &h->gb.buffer[h->gb.size_in_bits >> 3], length - 1); } skip_bits_long(&h->gb, 0); } |