summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-07-31 11:54:41 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-07-31 11:54:42 -0500
commit94f7427b177e41c39244108f3a79a9a9b69ec71b (patch)
treebe0d76637e3e17a14a45a811737acab175d5d8b6
parentd61ea4bcc28a9504d44534f435be1515d713a496 (diff)
parent077c58cd5c421edac3eb0f7cb453334bc51fa0ac (diff)
Merge "res_pjsip_session.c: Fix crashes seen when call cancelled."
-rw-r--r--res/res_pjsip_session.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 45446715f..625ab8be3 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -2713,8 +2713,10 @@ static void session_inv_on_media_update(pjsip_inv_session *inv, pj_status_t stat
struct ast_sip_session *session = inv->mod_data[session_module.id];
const pjmedia_sdp_session *local, *remote;
- if (!session->channel) {
- /* If we don't have a channel. We really don't care about media updates.
+ if (!session || !session->channel) {
+ /*
+ * If we don't have a session or channel then we really
+ * don't care about media updates.
* Just ignore
*/
return;