[asterisk-commits] wdoekes: trunk r423804 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Wed Sep 24 03:55:02 2014
New Revision: 423804

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423804
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
........

Merged revisions 423802 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 423803 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=423804&r1=423803&r2=423804
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Sep 24 03:55:02 2014
@@ -4391,7 +4391,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);
 	}
 
@@ -6458,6 +6458,10 @@
 		}
 		ast_free(p->options);
 		p->options = NULL;
+	}
+
+	if (p->outboundproxy) {
+		ref_proxy(p, NULL);
 	}
 
 	if (p->notify) {