diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_messaging.c | 6 | ||||
| -rw-r--r-- | res/res_pjsip_send_to_voicemail.c | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c index 54880dba9..596223293 100644 --- a/res/res_pjsip_messaging.c +++ b/res/res_pjsip_messaging.c @@ -530,6 +530,10 @@ static struct msg_data* msg_data_create(const struct ast_msg *msg, const char *t /* Make sure we start with sip: */ mdata->to = ast_begins_with(to, "sip:") ? ast_strdup(++to) : ast_strdup(to - 3); mdata->from = ast_strdup(from); + if (!mdata->to || !mdata->from) { + ao2_ref(mdata, -1); + return NULL; + } /* sometimes from can still contain the tag at this point, so remove it */ if ((tag = strchr(mdata->from, ';'))) { @@ -597,7 +601,7 @@ static int sip_msg_send(const struct ast_msg *msg, const char *to, const char *f if (!(mdata = msg_data_create(msg, to, from)) || ast_sip_push_task(message_serializer, msg_send, mdata)) { - ao2_ref(mdata, -1); + ao2_cleanup(mdata); return -1; } return 0; diff --git a/res/res_pjsip_send_to_voicemail.c b/res/res_pjsip_send_to_voicemail.c index e7197ad4a..12d6b74f6 100644 --- a/res/res_pjsip_send_to_voicemail.c +++ b/res/res_pjsip_send_to_voicemail.c @@ -47,7 +47,8 @@ #define SEND_TO_VM_HEADER_VALUE "feature_send_to_vm" #define SEND_TO_VM_REDIRECT "REDIRECTING(reason)" -#define SEND_TO_VM_REDIRECT_VALUE "\"send_to_vm\"" +#define SEND_TO_VM_REDIRECT_VALUE "send_to_vm" +#define SEND_TO_VM_REDIRECT_QUOTED_VALUE "\"" SEND_TO_VM_REDIRECT_VALUE "\"" static void send_response(struct ast_sip_session *session, int code, struct pjsip_rx_data *rdata) { @@ -102,9 +103,13 @@ static int has_diversion_reason(pjsip_rx_data *rdata) pjsip_param *reason; pjsip_fromto_hdr *hdr = get_diversion_header(rdata); - return hdr && - (reason = get_diversion_reason(hdr)) && - !pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_VALUE); + if (!hdr) { + return 0; + } + reason = get_diversion_reason(hdr); + return reason + && (!pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_QUOTED_VALUE) + || !pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_VALUE)); } static int has_call_feature(pjsip_rx_data *rdata) |