kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-09 01:06:00 +00:00
Code Issues Projects Releases Wiki Activity

[mod_sofia] Fix multiple issues in sofia_presence.c found by scan-build.

Browse Source
This commit is contained in:
Andrey Volk 2021-04-20 01:34:33 +03:00
parent fa0e616592
commit cba582cf4a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -482,7 +482,7 @@ struct mwi_helper {
static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) static void actual_sofia_presence_mwi_event_handler(switch_event_t *event)
{ {
char *account, *dup_account, *yn, *host, *user; char *account, *dup_account, *yn, *host = NULL, *user;
char *sql; char *sql;
sofia_profile_t *profile = NULL; sofia_profile_t *profile = NULL;
switch_stream_handle_t stream = { 0 }; switch_stream_handle_t stream = { 0 };
@ -514,8 +514,8 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event)
dup_account = strdup(account); dup_account = strdup(account);
switch_assert(dup_account != NULL);
switch_split_user_domain(dup_account, &user, &host); switch_split_user_domain(dup_account, &user, &host);
switch_assert(host != NULL);
if ((pname = switch_event_get_header(event, "sofia-profile"))) { if ((pname = switch_event_get_header(event, "sofia-profile"))) {
@ -523,7 +523,7 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event)
} }
if (!profile) { if (!profile) {
if (!host || !(profile = sofia_glue_find_profile(host))) { if (!(profile = sofia_glue_find_profile(host))) {
char *sql; char *sql;
char buf[512] = ""; char buf[512] = "";
switch_console_callback_match_t *matches; switch_console_callback_match_t *matches;
@ -4024,7 +4024,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
if (np.is_nat) { if (np.is_nat) {
char params[128] = ""; char params[128] = "";
if (contact->m_url->url_params) { if (contact && contact->m_url->url_params) {
switch_snprintf(params, sizeof(params), ";%s", contact->m_url->url_params); switch_snprintf(params, sizeof(params), ";%s", contact->m_url->url_params);
} }
ipv6 = strchr(np.network_ip, ':'); ipv6 = strchr(np.network_ip, ':');
@ -4039,8 +4039,10 @@ void sofia_presence_handle_sip_i_subscribe(int status,
if (sip->sip_via) { if (sip->sip_via) {
transport = sofia_glue_via2transport(sip->sip_via); transport = sofia_glue_via2transport(sip->sip_via);
} else { } else if (contact){
transport = sofia_glue_url2transport(contact->m_url); transport = sofia_glue_url2transport(contact->m_url);
} else {
transport = SOFIA_TRANSPORT_UNKNOWN;
} }
if (transport == SOFIA_TRANSPORT_TCP) { if (transport == SOFIA_TRANSPORT_TCP) {
@ -4739,7 +4741,7 @@ void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip)
{ {
url_t *to = sip->sip_to->a_url; url_t *to = sip->sip_to->a_url;
url_t *from = sip->sip_from->a_url; url_t *from = sip->sip_from->a_url;
switch_snprintf(hash_key, len, "%s%s%s", from->url_user, from->url_host, to->url_user); switch_snprintf(hash_key, len, "%s%s%s", (from && from->url_user) ? from->url_user : "", (from && from->url_host) ? from->url_host : "", (to && to->url_user) ? to->url_user : "");
} }
void sofia_presence_handle_sip_i_message(int status, void sofia_presence_handle_sip_i_message(int status,