From 1db1f76ee70358b0cd94ae540e9ca6dd6004b7d1 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 25 Sep 2012 17:21:08 +0000
Subject: [PATCH] Fix valgrind found memcpy issues in codec_ilbc.
Valgrind found codec_ilbc using memcpy instead of memmove for overlapping
memory blocks.
(issue ASTERISK-19890)
(closes issue ASTERISK-20231)
Reported by: Walter Doekes
Patches:
ASTERISK-20231.patch (license #5674) patch uploaded by Walter Doekes
........
Merged revisions 373640 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 373645 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@373650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
codecs/ilbc/iLBC_decode.c | 4 ++--
codecs/ilbc/iLBC_encode.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/codecs/ilbc/iLBC_decode.c b/codecs/ilbc/iLBC_decode.c
index 978d480ec1..e7bda11644 100644
--- a/codecs/ilbc/iLBC_decode.c
+++ b/codecs/ilbc/iLBC_decode.c
@@ -251,7 +251,7 @@
/* update memory */
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
memcpy(mem+CB_MEML-SUBL,
@@ -299,7 +299,7 @@
/* update memory */
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
memcpy(mem+CB_MEML-SUBL,
&reverseDecresidual[subframe*SUBL],
SUBL*sizeof(float));
diff --git a/codecs/ilbc/iLBC_encode.c b/codecs/ilbc/iLBC_encode.c
index 4636414030..4c2e6f714c 100644
--- a/codecs/ilbc/iLBC_encode.c
+++ b/codecs/ilbc/iLBC_encode.c
@@ -308,7 +308,7 @@
/* update memory */
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
memcpy(mem+CB_MEML-SUBL,
@@ -386,7 +386,7 @@
/* update memory */
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
memcpy(mem+CB_MEML-SUBL,
&reverseDecresidual[subframe*SUBL],
SUBL*sizeof(float));
--
GitLab