diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-17 22:39:55 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-17 22:39:55 +0000 |
commit | 379875cf0a9e8af97d66d3e01369f56fc4444d0d (patch) | |
tree | 713d0c66a7ae1adbe135fd0d4cba9344111ff71a /apps | |
parent | 81576dfb4b4788e907b4d86a509e463430f33587 (diff) |
Merged revisions 157253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r157253 | tilghman | 2008-11-17 16:25:06 -0600 (Mon, 17 Nov 2008) | 8 lines
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/branches/1.6.1@157255 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-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 afba9691f..b21edff3a 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -962,7 +962,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. @@ -971,10 +971,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); @@ -2060,6 +2060,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; } |