retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-7650: #resolve [mod_verto] Fix crash when making a call from a verto user with profile-variables in their user profile

This commit is contained in:
Michael Jerris 2015-06-17 10:34:35 -05:00
parent 35551d1d62
commit 637cd993e0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -3243,8 +3243,6 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
err = 1; goto cleanup;
}
switch_ivr_set_user(session, jsock->uid);
channel = switch_core_session_get_channel(session);
switch_channel_set_direction(channel, SWITCH_CALL_DIRECTION_INBOUND);
@ -3319,6 +3317,8 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
}
switch_ivr_set_user(session, jsock->uid);
switch_channel_set_profile_var(channel, "callee_id_name", remote_caller_id_name);
switch_channel_set_profile_var(channel, "callee_id_number", remote_caller_id_number);

2
src/switch_ivr.c
View File

@ -3274,7 +3274,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user_xml(switch_core_session_t *s
}
}
if ((x_params = switch_xml_child(x_user, "profile-variables"))) {
if (switch_channel_get_caller_profile(channel) && (x_params = switch_xml_child(x_user, "profile-variables"))) {
for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
const char *var = switch_xml_attr(x_param, "name");
const char *val = switch_xml_attr(x_param, "value");