[asterisk-commits] branch russell/hold_handling r37860 - in /team/russell/hold_handling: ./ frame.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jul 17 19:58:03 2006
New Revision: 37860

URL: http://svn.digium.com/view/asterisk?rev=37860&view=rev
Log:
Merged revisions 37857 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r37857 | russell | 2006-07-17 20:43:57 -0400 (Mon, 17 Jul 2006) | 10 lines

Merged revisions 37856 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r37856 | russell | 2006-07-17 20:41:47 -0400 (Mon, 17 Jul 2006) | 2 lines

don't crash if the frame has no data, but has a src

........

................

Modified:
    team/russell/hold_handling/   (props changed)
    team/russell/hold_handling/frame.c

Propchange: team/russell/hold_handling/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/russell/hold_handling/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 17 19:58:03 2006
@@ -1,1 +1,1 @@
-/trunk:1-37831
+/trunk:1-37859

Modified: team/russell/hold_handling/frame.c
URL: http://svn.digium.com/view/asterisk/team/russell/hold_handling/frame.c?rev=37860&r1=37859&r2=37860&view=diff
==============================================================================
--- team/russell/hold_handling/frame.c (original)
+++ team/russell/hold_handling/frame.c Mon Jul 17 19:58:03 2006
@@ -392,7 +392,7 @@
 		memcpy(out->data, f->data, out->datalen);	
 	}
 	if (srclen > 0) {
-		out->src = out->data + f->datalen;
+		out->src = buf + sizeof(*out) + AST_FRIENDLY_OFFSET + f->datalen;
 		/* Must have space since we allocated for it */
 		strcpy((char *)out->src, f->src);
 	}