[svn-commits] wdoekes: branch 12 r423802 - in /branches/12: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Wed Sep 24 03:52:24 2014
New Revision: 423802

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423802
Log:
chan_sip: Unref outbound proxy structure on dialog/pvt destruction.

Make sure outbound proxy refs are always unreffed on dialog destruction.

Review: https://reviewboard.asterisk.org/r/4016/
........

Merged revisions 423800 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 423801 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/channels/chan_sip.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=423802&r1=423801&r2=423802
==============================================================================
--- branches/12/channels/chan_sip.c (original)
+++ branches/12/channels/chan_sip.c Wed Sep 24 03:52:24 2014
@@ -4446,7 +4446,7 @@
 	  If obforcing is set, we will keep the outbound proxy during the whole
 	  dialog, regardless of what the SIP rfc says
 	*/
-	if (p->outboundproxy && !p->outboundproxy->force){
+	if (p->outboundproxy && !p->outboundproxy->force) {
 		ref_proxy(p, NULL);
 	}
 
@@ -6506,6 +6506,10 @@
 		}
 		ast_free(p->options);
 		p->options = NULL;
+	}
+
+	if (p->outboundproxy) {
+		ref_proxy(p, NULL);
 	}
 
 	if (p->notify) {