summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-02-03 10:06:32 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-02-03 10:06:32 -0600
commit43add4256733b3c1668092e8d8142a3ae01634ce (patch)
tree2ada533eec940a4d1bd48d95ce59ad2c60332120
parentdf948d1a09b04b0ef1a20cccec314fde54200e5a (diff)
parent73f92c2c52a3341d97f3f48d2beae95347250dab (diff)
Merge "res_pjsip_mwi.c: Fix null pointer crash"
-rw-r--r--res/res_pjsip_mwi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index 90fdc098c..4cd892c05 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -650,11 +650,11 @@ static void send_mwi_notify(struct mwi_subscription *sub)
.body_type = AST_SIP_MESSAGE_ACCUMULATOR,
.body_data = &counter,
};
- const char *resource = ast_sip_subscription_get_resource_name(sub->sip_sub);
ao2_callback(sub->stasis_subs, OBJ_NODATA, get_message_count, &counter);
if (sub->is_solicited) {
+ const char *resource = ast_sip_subscription_get_resource_name(sub->sip_sub);
struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub->sip_sub);
struct ast_sip_aor *aor = find_aor_for_resource(endpoint, resource);
pjsip_dialog *dlg = ast_sip_subscription_get_dialog(sub->sip_sub);