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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/extconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/extconf.c b/utils/extconf.c index 8245a161f..7e08aefaf 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -5812,7 +5812,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v whereweare += (len + 3); if (!var) - var = alloca(VAR_BUF_SIZE); + var = ast_alloca(VAR_BUF_SIZE); /* Store variable name (and truncate) */ ast_copy_string(var, vars, len + 1); @@ -5820,7 +5820,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v /* Substitute if necessary */ if (needsub) { if (!ltmp) - ltmp = alloca(VAR_BUF_SIZE); + ltmp = ast_alloca(VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE); pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); @@ -5830,7 +5830,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v } if (!workspace) - workspace = alloca(VAR_BUF_SIZE); + workspace = ast_alloca(VAR_BUF_SIZE); workspace[0] = '\0'; @@ -5887,7 +5887,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v whereweare += (len + 3); if (!var) - var = alloca(VAR_BUF_SIZE); + var = ast_alloca(VAR_BUF_SIZE); /* Store variable name (and truncate) */ ast_copy_string(var, vars, len + 1); @@ -5895,7 +5895,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v /* Substitute if necessary */ if (needsub) { if (!ltmp) - ltmp = alloca(VAR_BUF_SIZE); + ltmp = ast_alloca(VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE); pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); |