diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-09-25 17:22:25 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-09-25 17:22:25 +0000 |
| commit | 23be67622dc9916f9b206c995de925071acf4796 (patch) | |
| tree | 485c661373d9ba1f6dd00fc92775578baa1dc882 /codecs | |
| parent | a71a541edad6963fcbaa25f3999e4851d2a0be20 (diff) | |
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
........
Merged revisions 373650 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@373656 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/ilbc/iLBC_decode.c | 4 | ||||
| -rw-r--r-- | 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 978d480ec..e7bda1164 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 463641403..4c2e6f714 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)); |