diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
| commit | 9b16c8b0f6c3b6310e303411421bfcb16b26c3c4 (patch) | |
| tree | 273c31a834a21bd2239ec6b83cd35c602ea25d26 /funcs/func_logic.c | |
| parent | 6c23a60f802e7708389b1a6463a40dc0500512bd (diff) | |
Clean up and ensure proper usage of alloca()
This replaces all calls to alloca() with ast_alloca() which calls gcc's
__builtin_alloca() to avoid BSD semantics and removes all NULL checks
on memory allocated via ast_alloca() and ast_strdupa().
(closes issue ASTERISK-20125)
Review: https://reviewboard.asterisk.org/r/2032/
Patch-by: Walter Doekes (wdoekes)
........
Merged revisions 370642 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 370643 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_logic.c')
| -rw-r--r-- | funcs/func_logic.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/funcs/func_logic.c b/funcs/func_logic.c index 21f08a13f..e371f7ec1 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -250,17 +250,15 @@ static int import_helper(struct ast_channel *chan, const char *cmd, char *data, struct ast_channel *chan2; if ((chan2 = ast_channel_get_by_name(args.channel))) { - char *s = alloca(strlen(args.varname) + 4); - if (s) { - sprintf(s, "${%s}", args.varname); - ast_channel_lock(chan2); - if (buf) { - pbx_substitute_variables_helper(chan2, s, buf, len); - } else { - ast_str_substitute_variables(str, len, chan2, s); - } - ast_channel_unlock(chan2); + char *s = ast_alloca(strlen(args.varname) + 4); + sprintf(s, "${%s}", args.varname); + ast_channel_lock(chan2); + if (buf) { + pbx_substitute_variables_helper(chan2, s, buf, len); + } else { + ast_str_substitute_variables(str, len, chan2, s); } + ast_channel_unlock(chan2); chan2 = ast_channel_unref(chan2); } } |