diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-17 22:25:06 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-17 22:25:06 +0000 |
commit | af90ed7cfd8592c209ce082992ec167e908c3144 (patch) | |
tree | 37556bfa29884b9d318b812554226c306fda7412 /apps/app_dial.c | |
parent | bf74907f915581ad23d67c0d9e4ef6c773f7b3e5 (diff) |
Can't use items duplicated off the stack frame in an element returned from
a function: in these cases, we have to use the heap, or garbage will result.
(closes issue #13898)
Reported by: alecdavis
Patches:
20081114__bug13898__2.diff.txt uploaded by Corydon76 (license 14)
Tested by: alecdavis
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@157253 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 9d2bfe79b..e2e50f90e 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1170,7 +1170,7 @@ static int do_timelimit(struct ast_channel *chan, struct ast_bridge_config *conf play_to_caller = 1; var = pbx_builtin_getvar_helper(chan, "LIMIT_WARNING_FILE"); - config->warning_sound = !ast_strlen_zero(var) ? ast_strdupa(var) : "timeleft"; + config->warning_sound = !ast_strlen_zero(var) ? ast_strdup(var) : ast_strdup("timeleft"); /* The code looking at config wants a NULL, not just "", to decide * that the message should not be played, so we replace "" with NULL. @@ -1179,10 +1179,10 @@ static int do_timelimit(struct ast_channel *chan, struct ast_bridge_config *conf */ var = pbx_builtin_getvar_helper(chan, "LIMIT_TIMEOUT_FILE"); - config->end_sound = !ast_strlen_zero(var) ? ast_strdupa(var) : NULL; + config->end_sound = !ast_strlen_zero(var) ? ast_strdup(var) : NULL; var = pbx_builtin_getvar_helper(chan, "LIMIT_CONNECT_FILE"); - config->start_sound = !ast_strlen_zero(var) ? ast_strdupa(var) : NULL; + config->start_sound = !ast_strlen_zero(var) ? ast_strdup(var) : NULL; ast_channel_unlock(chan); @@ -2264,6 +2264,15 @@ out: } done: + if (config.warning_sound) { + ast_free((char *)config.warning_sound); + } + if (config.end_sound) { + ast_free((char *)config.end_sound); + } + if (config.start_sound) { + ast_free((char *)config.start_sound); + } return res; } |