[asterisk-commits] jrose: trunk r389897 - in /trunk: ./ main/slinfactory.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue May 28 12:47:29 2013
New Revision: 389897

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

Modified:
    trunk/   (props changed)
    trunk/main/slinfactory.c

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

Modified: trunk/main/slinfactory.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/slinfactory.c?view=diff&rev=389897&r1=389896&r2=389897
==============================================================================
--- trunk/main/slinfactory.c (original)
+++ trunk/main/slinfactory.c Tue May 28 12:47:29 2013
@@ -147,7 +147,7 @@
 
 		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;