[asterisk-commits] rmudgett: trunk r433089 - in /trunk: ./ res/res_pjsip_session.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Mar 17 21:42:16 2015
New Revision: 433089

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433089
Log:
res_pjsip_session: Fix off-nominal extra unref of session.
........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_session.c

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

Modified: trunk/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_session.c?view=diff&rev=433089&r1=433088&r2=433089
==============================================================================
--- trunk/res/res_pjsip_session.c (original)
+++ trunk/res/res_pjsip_session.c Tue Mar 17 21:42:16 2015
@@ -1869,7 +1869,7 @@
 			ast_pjsip_rdata_get_endpoint(rdata), ao2_cleanup);
 	pjsip_tx_data *tdata = NULL;
 	pjsip_inv_session *inv_session = NULL;
-	RAII_VAR(struct ast_sip_session *, session, NULL, ao2_cleanup);
+	struct ast_sip_session *session;
 	struct new_invite *invite;
 
 	ast_assert(endpoint != NULL);
@@ -1897,10 +1897,9 @@
 		} else {
 			pjsip_inv_send_msg(inv_session, tdata);
 		}
-		ao2_ref(session, -1);
 		ao2_cleanup(invite);
-		return;
-	}
+	}
+	ao2_ref(session, -1);
 }
 
 static pj_bool_t does_method_match(const pj_str_t *message_method, const char *supplement_method)