[svn-commits] qwell: trunk r88586 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Nov  5 11:21:05 2007
New Revision: 88586

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88586
Log:
Merged revisions 88585 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11163)
........
r88585 | qwell | 2007-11-05 11:19:41 -0600 (Mon, 05 Nov 2007) | 4 lines

Make sure we destroy the config structure on configuration failure.

Issue 11163, patch by eliel.

........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=88586&r1=88585&r2=88586
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Nov  5 11:21:05 2007
@@ -18329,6 +18329,7 @@
 	internip = bindaddr;
 	if (ast_find_ourip(&internip.sin_addr, bindaddr)) {
 		ast_log(LOG_WARNING, "Unable to get own IP address, SIP disabled\n");
+		ast_config_destroy(cfg);
 		return 0;
 	}
 	ast_mutex_lock(&netlock);
@@ -18340,6 +18341,7 @@
 		sipsock = socket(AF_INET, SOCK_DGRAM, 0);
 		if (sipsock < 0) {
 			ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno));
+			ast_config_destroy(cfg);
 			return -1;
 		} else {
 			/* Allow SIP clients on the same host to access us: */