kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_rfc3326.c: Fix crash when channel goes away."

Browse Source
This commit is contained in:
Matt Jordan
2015-11-18 07:33:57 -06:00
committed by Gerrit Code Review
parent 4013f9d577 436023a322
commit e90bb44b76
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_pjsip_rfc3326.c
View File

@@ -32,6 +32,7 @@
#include "asterisk/res_pjsip_session.h" #include "asterisk/res_pjsip_session.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/causes.h" #include "asterisk/causes.h"
#include "asterisk/threadpool.h"
static void rfc3326_use_reason_header(struct ast_sip_session *session, struct pjsip_rx_data *rdata) static void rfc3326_use_reason_header(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
{ {
@@ -101,9 +102,15 @@ static void rfc3326_add_reason_header(struct ast_sip_session *session, struct pj
static void rfc3326_outgoing_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata) static void rfc3326_outgoing_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata)
{ {
if ((pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_bye_method) && if ((pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_bye_method)
pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_cancel_method)) || && pjsip_method_cmp(&tdata->msg->line.req.method, &pjsip_cancel_method))
!session->channel) { || !session->channel
/*
* The session->channel has been seen to go away on us between
* checks so we must also be running under the call's serializer
* thread.
*/
|| session->serializer != ast_threadpool_serializer_get_current()) {
return; return;
} }
@@ -114,7 +121,9 @@ static void rfc3326_outgoing_response(struct ast_sip_session *session, struct pj
{ {
struct pjsip_status_line status = tdata->msg->line.status; struct pjsip_status_line status = tdata->msg->line.status;
if ((status.code < 300) || !session->channel) { if (status.code < 300
|| !session->channel
|| session->serializer != ast_threadpool_serializer_get_current()) {
return; return;
} }