[asterisk-commits] res pjsip t38: Make t38 reinvite response cb tolerant of NU... (asterisk[master])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 6 06:48:45 CDT 2017
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/6387 )
Change subject: res_pjsip_t38: Make t38_reinvite_response_cb tolerant of NULL channel
......................................................................
res_pjsip_t38: Make t38_reinvite_response_cb tolerant of NULL channel
t38_reinvite_response_cb can get called by res_pjsip_session's
session_inv_on_tsx_state_changed in situations where session->channel
is NULL. If it is, the ast_log warning segfaults because it tries
to get the channel name from a NULL channel.
* Check session->channel and print "unknown channel" when it's NULL.
ASTERISK-27236
Reported by: Ross Beer
Change-Id: I4326e288d36327f6c79ab52226d54905cdc87dc7
---
M res/res_pjsip_t38.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index 27eff42..ce914a1 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -302,9 +302,9 @@
}
state = t38_state_get_or_alloc(session);
- if (!state) {
+ if (!session->channel || !state) {
ast_log(LOG_WARNING, "Received response to T.38 re-invite on '%s' but state unavailable\n",
- ast_channel_name(session->channel));
+ session->channel ? ast_channel_name(session->channel) : "unknown channel");
return 0;
}
--
To view, visit https://gerrit.asterisk.org/6387
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4326e288d36327f6c79ab52226d54905cdc87dc7
Gerrit-Change-Number: 6387
Gerrit-PatchSet: 2
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20170906/1036e1f3/attachment-0001.html>
More information about the asterisk-commits
mailing list