mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user