[svn-commits] russell: branch russell/readq-1.4 r88596 - in /team/russell/readq-1.4: ./ cha...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Nov  5 11:40:24 2007
New Revision: 88596

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88596
Log:
sync with 1.4 branch

Modified:
    team/russell/readq-1.4/   (props changed)
    team/russell/readq-1.4/channels/chan_sip.c

Propchange: team/russell/readq-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov  5 11:40:24 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-88573
+/branches/1.4:1-88588

Modified: team/russell/readq-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/readq-1.4/channels/chan_sip.c?view=diff&rev=88596&r1=88595&r2=88596
==============================================================================
--- team/russell/readq-1.4/channels/chan_sip.c (original)
+++ team/russell/readq-1.4/channels/chan_sip.c Mon Nov  5 11:40:24 2007
@@ -16973,6 +16973,7 @@
 	}
 	if (ast_find_ourip(&__ourip, bindaddr)) {
 		ast_log(LOG_WARNING, "Unable to get own IP address, SIP disabled\n");
+		ast_config_destroy(cfg);
 		return 0;
 	}
 	if (!ntohs(bindaddr.sin_port))
@@ -16987,6 +16988,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: */