diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-05-28 17:47:29 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-05-28 17:47:29 +0000 |
| commit | bb584c55dee3fbe1bd6d4ecffdfff2c74733cc65 (patch) | |
| tree | f45b33e8a7881b3d9ddaa70ef3871ebe9f239f34 /main/slinfactory.c | |
| parent | 45dc10de842c9433518f71557d7124038a7d08dd (diff) | |
Fix a memory copying bug in slinfactory which was causing mixmonitor issues.
Reported by: Michael Walton
Tested by: Jonathan Rose
Patches:
slinfactory.c.ASTERISK-21799.patch uploaded by Michael Walton (license 6502)
(closes issue ASTERISK-21799)
........
Merged revisions 389895 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 389896 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/slinfactory.c')
| -rw-r--r-- | main/slinfactory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index 921edb090..687a6c02d 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -147,7 +147,7 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) if (sf->holdlen) { if (sf->holdlen <= ineed) { - memcpy(offset, sf->hold, sf->holdlen * sizeof(*offset)); + memcpy(offset, sf->offset, sf->holdlen * sizeof(*offset)); sofar += sf->holdlen; offset += sf->holdlen; sf->holdlen = 0; |