kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #578 in FS/freeswitch from ~MARKL/freeswitch:bugfix/FS-8413-segfault-calling-session-getvariable-nil to master 

* commit '6288af5ef19b1d081b6ea0d2aed0ca19c9a77671':
  FS-8413: Segfault calling session:getVariable(nil) in lua script
This commit is contained in:
Brian West 2015-11-04 07:15:08 -06:00
parent cffc673879 6288af5ef1
commit 799bb4933c
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/switch_channel.c
View File

@ -944,32 +944,34 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_dup(switch_channel_t *c
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
if (channel->scope_variables) { if (!zstr(varname)) {
switch_event_t *ep; if (channel->scope_variables) {
switch_event_t *ep;
for (ep = channel->scope_variables; ep; ep = ep->next) { for (ep = channel->scope_variables; ep; ep = ep->next) {
if ((v = switch_event_get_header_idx(ep, varname, idx))) { if ((v = switch_event_get_header_idx(ep, varname, idx))) {
break; break;
} }
}
}
if (!v && (!channel->variables || !(v = switch_event_get_header_idx(channel->variables, varname, idx)))) {
switch_caller_profile_t *cp = switch_channel_get_caller_profile(channel);
if (cp) {
if (!strncmp(varname, "aleg_", 5)) {
cp = cp->originator_caller_profile;
varname += 5;
} else if (!strncmp(varname, "bleg_", 5)) {
cp = cp->originatee_caller_profile;
varname += 5;
} }
} }
if (!cp || !(v = switch_caller_get_field_by_name(cp, varname))) { if (!v && (!channel->variables || !(v = switch_event_get_header_idx(channel->variables, varname, idx)))) {
if ((vdup = switch_core_get_variable_pdup(varname, switch_core_session_get_pool(channel->session)))) { switch_caller_profile_t *cp = switch_channel_get_caller_profile(channel);
v = vdup;
if (cp) {
if (!strncmp(varname, "aleg_", 5)) {
cp = cp->originator_caller_profile;
varname += 5;
} else if (!strncmp(varname, "bleg_", 5)) {
cp = cp->originatee_caller_profile;
varname += 5;
}
}
if (!cp || !(v = switch_caller_get_field_by_name(cp, varname))) {
if ((vdup = switch_core_get_variable_pdup(varname, switch_core_session_get_pool(channel->session)))) {
v = vdup;
}
} }
} }
} }