[asterisk-commits] mmichelson: branch 1.6.0 r186517 - /branches/1.6.0/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Apr  3 16:27:52 2009
New Revision: 186517

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186517
Log:
Remove an invalid call to free memory.

A bad merge from trunk to 1.6.0 meant freeing memory that
should not be freed. In trunk, pkt->data is an ast_str, but
in 1.6.0, it is allocated in the same chunk of memory as the
sip_pkt. This only affects 1.6.0.

(closes issue #14819)
Reported by: cwolff09


Modified:
    branches/1.6.0/channels/chan_sip.c

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=186517&r1=186516&r2=186517
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Apr  3 16:27:52 2009
@@ -2925,7 +2925,6 @@
 		ast_log(LOG_ERROR, "Serious Network Trouble; __sip_xmit returns error for pkt data\n");
 		AST_SCHED_DEL(sched, pkt->retransid);
 		p->packets = pkt->next;
-		ast_free(pkt->data);
 		ast_free(pkt);
 		return AST_FAILURE;
 	} else {