diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-12 18:44:36 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-12 18:44:36 +0000 |
| commit | 91879350bec01432e41753f74715c608f14085fb (patch) | |
| tree | a712d5cb7c75e76cccf049e5ae6a183e4b7951fe /main | |
| parent | cbb22ba26a195239fe78a1a438e2c2234ac6f590 (diff) | |
Based on a note in asterisk-dev by Brian Capouch, I determined I too agressive in not initializing arrays passed to pbx_substitute_variables_xxxx; I reviewed the code (again) and hopefully found every possible spot where substitute_variables is called conditionally, and made sure the char array involved was set to a null string.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89186 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 483bb762e..4d4fcd3b0 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1652,6 +1652,7 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan, continue; } /* Substitute variables now */ + if (sw->eval) pbx_substitute_variables_helper(chan, sw->data, sw->tmpdata, SWITCH_DATA_LENGTH - 1); @@ -6886,7 +6887,7 @@ int pbx_builtin_importvar(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "Ignoring, since there is no variable to set\n"); return 0; } - + tmp[0] = 0; if (!deprecation_warning) { ast_log(LOG_WARNING, "ImportVar is deprecated. Please use Set(varname=${IMPORT(channel,variable)}) instead.\n"); deprecation_warning = 1; |