Merged revisions 88585 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 5 Nov 2007 17:21:05 +0000 (17:21 +0000)
committerJason Parker <jparker@digium.com>
Mon, 5 Nov 2007 17:21:05 +0000 (17:21 +0000)
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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88586 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 1b13693..257102e 100644 (file)
@@ -18329,6 +18329,7 @@ static int reload_config(enum channelreloadreason reason)
        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 @@ static int reload_config(enum channelreloadreason reason)
                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: */