kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert alloca changes for utils

Browse Source 
These changes were a tad overzealous in the utils directory.
Unfortunately, these don't compile with a "make".
........

Merged revisions 370697 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 370698 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2012-08-01 02:26:53 +00:00
parent 4377d511ae
commit ee0d991102
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/extconf.c
View File

@@ -5812,7 +5812,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
whereweare += (len + 3); whereweare += (len + 3);
if (!var) if (!var)
var = ast_alloca(VAR_BUF_SIZE); var = alloca(VAR_BUF_SIZE);
/* Store variable name (and truncate) */ /* Store variable name (and truncate) */
ast_copy_string(var, vars, len + 1); 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 */ /* Substitute if necessary */
if (needsub) { if (needsub) {
if (!ltmp) if (!ltmp)
ltmp = ast_alloca(VAR_BUF_SIZE); ltmp = alloca(VAR_BUF_SIZE);
memset(ltmp, 0, VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE);
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); 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) if (!workspace)
workspace = ast_alloca(VAR_BUF_SIZE); workspace = alloca(VAR_BUF_SIZE);
workspace[0] = '\0'; workspace[0] = '\0';
@@ -5887,7 +5887,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
whereweare += (len + 3); whereweare += (len + 3);
if (!var) if (!var)
var = ast_alloca(VAR_BUF_SIZE); var = alloca(VAR_BUF_SIZE);
/* Store variable name (and truncate) */ /* Store variable name (and truncate) */
ast_copy_string(var, vars, len + 1); 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 */ /* Substitute if necessary */
if (needsub) { if (needsub) {
if (!ltmp) if (!ltmp)
ltmp = ast_alloca(VAR_BUF_SIZE); ltmp = alloca(VAR_BUF_SIZE);
memset(ltmp, 0, VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE);
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1);