[asterisk-commits] russell: branch 1.6.1 r155272 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Nov  7 09:43:55 2008
New Revision: 155272

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

........
r155264 | russell | 2008-11-07 09:42:04 -0600 (Fri, 07 Nov 2008) | 3 lines

Remove a bogus ast_free() that Kevin noticed.  This was probably just left over 
from pre-astobj2ified chan_sip.

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=155272&r1=155271&r2=155272
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Nov  7 09:43:55 2008
@@ -6042,7 +6042,6 @@
 
 	if (ast_string_field_init(p, 512)) {
 		ao2_t_ref(p, -1, "failed to string_field_init, drop p");
-		ast_free(p);
 		return NULL;
 	}