kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash from trying to end a session in an invalid way.

Browse Source 
This ensures that code that was only meant to be run on a reinvite failure
only runs on a reinvite failure.

(closes issue ASTERISK-22061)
reported by Rusty Newton



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-07-16 19:13:04 +00:00
parent 6ba25dd3f2
commit 6bdd453168
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_sip_session.c
View File

@@ -1609,13 +1609,14 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans
if (tsx->status_code == PJSIP_SC_REQUEST_PENDING) {
reschedule_reinvite(session, tsx->mod_data[session_module.id], tsx->last_tx);
return;
} else {
/* Other failures result in destroying the session. */
} else if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
/* Other reinvite failures result in destroying the session. */
pjsip_tx_data *tdata;
pjsip_inv_end_session(inv, 500, NULL, &tdata);
if (pjsip_inv_end_session(inv, 500, NULL, &tdata) == PJ_SUCCESS) {
ast_sip_session_send_request(session, tdata);
}
}
}
} else {
if (tsx->role == PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING) {
handle_incoming_request(session, e->body.tsx_state.src.rdata);