From: Jonathan Rose <jrose@digium.com>
Date: Tue, 28 May 2013 17:47:29 +0000 (+0000)
Subject: Fix a memory copying bug in slinfactory which was causing mixmonitor issues.
X-Git-Tag: 13.0.0-beta1~1753
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb584c55dee3fbe1bd6d4ecffdfff2c74733cc65;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/slinfactory.c b/main/slinfactory.c
index 921edb0903..687a6c02db 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;