[asterisk-commits] rmudgett: branch 11 r373650 - in /branches/11: ./ codecs/ilbc/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Sep 25 12:21:08 2012
New Revision: 373650

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373650
Log:
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

Modified:
    branches/11/   (props changed)
    branches/11/codecs/ilbc/iLBC_decode.c
    branches/11/codecs/ilbc/iLBC_encode.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/codecs/ilbc/iLBC_decode.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/codecs/ilbc/iLBC_decode.c?view=diff&rev=373650&r1=373649&r2=373650
==============================================================================
--- branches/11/codecs/ilbc/iLBC_decode.c (original)
+++ branches/11/codecs/ilbc/iLBC_decode.c Tue Sep 25 12:21:08 2012
@@ -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));

Modified: branches/11/codecs/ilbc/iLBC_encode.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/codecs/ilbc/iLBC_encode.c?view=diff&rev=373650&r1=373649&r2=373650
==============================================================================
--- branches/11/codecs/ilbc/iLBC_encode.c (original)
+++ branches/11/codecs/ilbc/iLBC_encode.c Tue Sep 25 12:21:08 2012
@@ -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));