From: Olle Johansson <oej@edvina.net>
Date: Sat, 2 Jan 2010 10:01:48 +0000 (+0000)
Subject: Merged revisions 237136 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c27e19539e791f0d7911f28f7e8ffbf2119f7e;p=thirdparty%2Fasterisk.git

Merged revisions 237136 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r237136 | oej | 2010-01-02 10:54:22 +0100 (Lör, 02 Jan 2010) | 10 lines

Merged revisions 237135 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r237135 | oej | 2010-01-02 10:52:30 +0100 (Lör, 02 Jan 2010) | 2 lines

Release memory of the contact acl before unloading module

........

................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 88bdd1f30e..2d3dfbe826 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -24785,6 +24785,7 @@ static int unload_module(void)
 	ao2_t_ref(threadt, -1, "unref the thread table");
 
 	clear_sip_domains();
+	ast_free_ha(global_contact_ha);
 	close(sipsock);
 	sched_context_destroy(sched);
 	con = ast_context_find(used_context);