[svn-commits] russell: branch 1.6.1 r164521 - in /branches/1.6.1: ./ main/frame.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 15 16:00:33 2008
New Revision: 164521

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

........
r164519 | russell | 2008-12-15 15:53:30 -0600 (Mon, 15 Dec 2008) | 7 lines

Make sure we handle a uint32_t payload in ast_frdup()

(closes issue #14080)
Reported by: fnordian
Patches:
      frame.patch uploaded by fnordian (license 110)

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/frame.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/frame.c?view=diff&rev=164521&r1=164520&r2=164521
==============================================================================
--- branches/1.6.1/main/frame.c (original)
+++ branches/1.6.1/main/frame.c Mon Dec 15 16:00:33 2008
@@ -476,6 +476,8 @@
 	if (out->datalen) {
 		out->data.ptr = buf + sizeof(*out) + AST_FRIENDLY_OFFSET;
 		memcpy(out->data.ptr, f->data.ptr, out->datalen);	
+	} else {
+		out->data.uint32 = f->data.uint32;
 	}
 	if (srclen > 0) {
 		/* This may seem a little strange, but it's to avoid a gcc (4.2.4) compiler warning */