From: Matthew Nicholson <mnicholson@digium.com>
Date: Tue, 22 Jun 2010 17:37:26 +0000 (+0000)
Subject: Merged revisions 271903 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61d6dccd7f98606e5993bde62f0534e52b32da36;p=thirdparty%2Fasterisk.git

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

................
  r271903 | mnicholson | 2010-06-22 12:35:17 -0500 (Tue, 22 Jun 2010) | 15 lines

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

  ........
    r271902 | mnicholson | 2010-06-22 12:31:57 -0500 (Tue, 22 Jun 2010) | 8 lines

    Decrease the module ref count in sip_hangup when SIP_DEFER_BYE_ON_TRANSFER is set.  This is necessary to keep the ref count correct.

    (closes issue #16815)
    Reported by: rain
    Patches:
          chan_sip-unref-fix.diff uploaded by rain (license 327) (modified)
    Tested by: rain
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3c20026564..71b00da613 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6002,6 +6002,7 @@ static int sip_hangup(struct ast_channel *ast)
 		sip_pvt_lock(p);
 		p->owner = NULL;  /* Owner will be gone after we return, so take it away */
 		sip_pvt_unlock(p);
+		ast_module_unref(ast_module_info->self);
 		return 0;
 	}