Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Michael Jerris 2015-06-17 10:34:35 -05:00 committed by Brian West
parent e0edc956d8
commit e2d0de3d8e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3301,8 +3301,6 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
err = 1; goto cleanup; err = 1; goto cleanup;
} }
switch_ivr_set_user(session, jsock->uid);
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
switch_channel_set_direction(channel, SWITCH_CALL_DIRECTION_INBOUND); switch_channel_set_direction(channel, SWITCH_CALL_DIRECTION_INBOUND);
@ -3402,6 +3400,7 @@ static switch_bool_t verto__invite_func(const char *method, cJSON *params, jsock
} }
switch_ivr_set_user(session, jsock->uid);
for (hp = jsock->user_vars->headers; hp; hp = hp->next) { for (hp = jsock->user_vars->headers; hp; hp = hp->next) {
switch_channel_set_variable(channel, hp->name, hp->value); switch_channel_set_variable(channel, hp->name, hp->value);

2
src/switch_ivr.c
View File

@ -3284,7 +3284,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) { 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 *var = switch_xml_attr(x_param, "name");
const char *val = switch_xml_attr(x_param, "value"); const char *val = switch_xml_attr(x_param, "value");