diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-04-24 09:24:47 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-04-24 09:24:48 -0500 |
| commit | bf3d9db4a6c443e9284a668aa48b4e5f0d3d8af5 (patch) | |
| tree | c51490846cca4da083fd0b2523f7066e09745fa3 | |
| parent | b3cd5bc77feea8d91909d540b398ab559cd91a1e (diff) | |
| parent | eabf3b5a3c06535d092f4872c0e733fc72dba061 (diff) | |
Merge "res_pjsip_t38: Don't crash on authenticated reinvite after originated T.38 FAX." into 13
| -rw-r--r-- | res/res_pjsip_t38.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c index ac31086a6..06a73cc11 100644 --- a/res/res_pjsip_t38.c +++ b/res/res_pjsip_t38.c @@ -470,6 +470,11 @@ static void t38_attach_framehook(struct ast_sip_session *session) .chan_breakdown_cb = t38_masq, }; + /* If the channel's already gone, bail */ + if (!session->channel) { + return; + } + /* Only attach the framehook if t38 is enabled for the endpoint */ if (!session->endpoint->media.t38.enabled) { return; @@ -504,14 +509,14 @@ static void t38_attach_framehook(struct ast_sip_session *session) ast_channel_unlock(session->channel); } -/*! \brief Function called when an INVITE goes out */ +/*! \brief Function called when an INVITE arrives */ static int t38_incoming_invite_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata) { t38_attach_framehook(session); return 0; } -/*! \brief Function called when an INVITE comes in */ +/*! \brief Function called when an INVITE is sent */ static void t38_outgoing_invite_request(struct ast_sip_session *session, struct pjsip_tx_data *tdata) { t38_attach_framehook(session); |