[asterisk-commits] trunk r37857 - in /trunk: ./ frame.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jul 17 19:43:57 2006
New Revision: 37857

URL: http://svn.digium.com/view/asterisk?rev=37857&view=rev
Log:
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:
    trunk/   (props changed)
    trunk/frame.c

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

Modified: trunk/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/frame.c?rev=37857&r1=37856&r2=37857&view=diff
==============================================================================
--- trunk/frame.c (original)
+++ trunk/frame.c Mon Jul 17 19:43:57 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);
 	}