use memmove() when memory regions might overlap (issue #4957)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6372 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/ilbc/iLBC_decode.c b/codecs/ilbc/iLBC_decode.c
index 91c80c8e22bf68927eded2c3678237f29631287a..22bfff792d282ec4aff476ba57dfd4b2608448ae 100755 (executable)
--- a/codecs/ilbc/iLBC_decode.c
+++ b/codecs/ilbc/iLBC_decode.c
@@ -241,7 +241,7 @@ static void Decode(
 
             /* 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, 
                 &decresidual[(start+1+subframe)*SUBL],
                 SUBL*sizeof(float));
@@ -286,7 +286,7 @@ static void Decode(
 
             /* 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 e2090626e2516fa9a03b89c1dee66161a2576633..bd14964983f134917cc6560057655d69cf21ed0a 100755 (executable)
--- a/codecs/ilbc/iLBC_encode.c
+++ b/codecs/ilbc/iLBC_encode.c
@@ -294,7 +294,7 @@ void iLBC_encode(
 
             /* 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, 
                 &decresidual[(start+1+subframe)*SUBL], 
                 SUBL*sizeof(float));
@@ -364,7 +364,7 @@ void iLBC_encode(
 
             /* 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));