[asterisk-commits] twilson: trunk r314551 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Apr 20 19:29:21 2011
New Revision: 314551

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314551
Log:
Merged revisions 314550 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r314550 | twilson | 2011-04-20 17:23:04 -0700 (Wed, 20 Apr 2011) | 13 lines
  
  Merged revisions 314549 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r314549 | twilson | 2011-04-20 17:17:34 -0700 (Wed, 20 Apr 2011) | 6 lines
    
    Don't allocate more space than necessary for a sip_pkt
    
    This extra allocation is a hold-over from when pkt->data was a 
    character array. Now that it is an allocated string, just allocate 
    enough for the sip_pkt.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=314551&r1=314550&r2=314551
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Apr 20 19:29:21 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 */