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
commit 799bb4933c
1 changed files with 24 additions and 22 deletions

View File

@ -944,6 +944,7 @@ 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 (!zstr(varname)) {
if (channel->scope_variables) { if (channel->scope_variables) {
switch_event_t *ep; switch_event_t *ep;
@ -973,6 +974,7 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_dup(switch_channel_t *c
} }
} }
} }
}
if (dup && v != vdup) { if (dup && v != vdup) {
if (v) { if (v) {