[asterisk-commits] dvossel: branch dvossel/hd_confbridge r314597 - in /team/dvossel/hd_confbridg...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Apr 21 12:35:50 2011
New Revision: 314597

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314597
Log:
bringing branch up to date with trunk

Modified:
    team/dvossel/hd_confbridge/   (props changed)
    team/dvossel/hd_confbridge/channels/chan_sip.c

Propchange: team/dvossel/hd_confbridge/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/dvossel/hd_confbridge/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 21 12:35:50 2011
@@ -1,1 +1,1 @@
-/trunk:1-314511
+/trunk:1-314596

Modified: team/dvossel/hd_confbridge/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/channels/chan_sip.c?view=diff&rev=314597&r1=314596&r2=314597
==============================================================================
--- team/dvossel/hd_confbridge/channels/chan_sip.c (original)
+++ team/dvossel/hd_confbridge/channels/chan_sip.c Thu Apr 21 12:35:50 2011
@@ -3556,7 +3556,7 @@
 		}
 	}
 
-	if (!(pkt = ast_calloc(1, sizeof(*pkt) + len + 1))) {
+	if (!(pkt = ast_calloc(1, sizeof(*pkt)))) {
 		return AST_FAILURE;
 	}
 	/* copy data, add a terminator and save length */