Merge "res_pjsip_send_to_voicemail.c: Fix off-nominal double channel unref." into 13

10 years ago · 3b6b164f2e
parent d6e274b97d 4c5998ff55
commit 3b6b164f2e
1 changed files with 1 additions and 2 deletions
--- a/res/res_pjsip_send_to_voicemail.c
+++ b/res/res_pjsip_send_to_voicemail.c
@ -165,12 +165,10 @@ static int handle_incoming_request(struct ast_sip_session *session, struct pjsip
 	sip_session_datastore->data = other_party;

 	if (ast_sip_session_add_datastore(session, sip_session_datastore)) {
-		ast_channel_unref(other_party);
 		ao2_ref(sip_session_datastore, -1);
 		send_response(session, 500, rdata);
 		return -1;
 	}
-	ao2_ref(sip_session_datastore, -1);

 	if (has_feature) {
 		pbx_builtin_setvar_helper(other_party, SEND_TO_VM_HEADER,
@ -182,6 +180,7 @@ static int handle_incoming_request(struct ast_sip_session *session, struct pjsip
 					  SEND_TO_VM_REDIRECT_VALUE);
 	}

+	ao2_ref(sip_session_datastore, -1);
 	return 0;
 }