diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 22f834d376..5ad1174047 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -1466,7 +1466,8 @@ static void transfer_redirect(struct ast_sip_session *session, const char *targe pjsip_contact_hdr *contact; pj_str_t tmp; - if (pjsip_inv_end_session(session->inv_session, 302, NULL, &packet) != PJ_SUCCESS) { + if (pjsip_inv_end_session(session->inv_session, 302, NULL, &packet) != PJ_SUCCESS + || !packet) { ast_log(LOG_WARNING, "Failed to redirect PJSIP session for channel %s\n", ast_channel_name(session->channel)); message = AST_TRANSFER_FAILED; @@ -2231,7 +2232,8 @@ static int chan_pjsip_incoming_request(struct ast_sip_session *session, struct p ast_sip_session_add_datastore(session, datastore); if (!(session->channel = chan_pjsip_new(session, AST_STATE_RING, session->exten, NULL, NULL, NULL, NULL))) { - if (pjsip_inv_end_session(session->inv_session, 503, NULL, &packet) == PJ_SUCCESS) { + if (pjsip_inv_end_session(session->inv_session, 503, NULL, &packet) == PJ_SUCCESS + && packet) { ast_sip_session_send_response(session, packet); } diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c index df54251798..1043a1e24d 100644 --- a/res/res_pjsip_refer.c +++ b/res/res_pjsip_refer.c @@ -969,7 +969,8 @@ inv_replace_failed: session->defer_terminate = 1; ast_hangup(session->channel); - if (pjsip_inv_end_session(session->inv_session, response, NULL, &packet) == PJ_SUCCESS) { + if (pjsip_inv_end_session(session->inv_session, response, NULL, &packet) == PJ_SUCCESS + && packet) { ast_sip_session_send_response(session, packet); } } else { diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index eb9551097a..6287c17ec0 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -2651,7 +2651,8 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans } if (tsx->status_code != 488) { /* Other reinvite failures (except 488) result in destroying the session. */ - if (pjsip_inv_end_session(inv, 500, NULL, &tdata) == PJ_SUCCESS) { + if (pjsip_inv_end_session(inv, 500, NULL, &tdata) == PJ_SUCCESS + && tdata) { ast_sip_session_send_request(session, tdata); } } @@ -2664,7 +2665,8 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans * a cancelled call. Our role is to immediately send a BYE to end the * dialog. */ - if (pjsip_inv_end_session(inv, 500, NULL, &tdata) == PJ_SUCCESS) { + if (pjsip_inv_end_session(inv, 500, NULL, &tdata) == PJ_SUCCESS + && tdata) { ast_sip_session_send_request(session, tdata); } }