kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-09 14:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull in a piece of murf's 88166 patch that makes it safe to call

Browse Source 
pbx_substitute_variables_helper_full with a non-zero'd buffer 



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@194322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Doug Bailey
2009-05-13 16:18:36 +00:00
parent 0a55b56dc8
commit 0e29c52c46
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/pbx.c
View File

@@ -1573,8 +1573,7 @@ int ast_func_write(struct ast_channel *chan, char *function, const char *value)
static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead *headp, const char *cp1, char *cp2, int count) static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead *headp, const char *cp1, char *cp2, int count)
{ {
/* Substitutes variables into cp2, based on string cp1, and assuming cp2 to be /* Substitutes variables into cp2, based on string cp1, cp2 NO LONGER NEEDS TO BE ZEROED OUT!!!! */
zero-filled */
char *cp4; char *cp4;
const char *tmp, *whereweare; const char *tmp, *whereweare;
int length, offset, offset2, isfunction; int length, offset, offset2, isfunction;
@@ -1584,6 +1583,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
char *vars, *vare; char *vars, *vare;
int pos, brackets, needsub, len; int pos, brackets, needsub, len;
*cp2 = 0; /* just in case nothing ends up there */
whereweare=tmp=cp1; whereweare=tmp=cp1;
while (!ast_strlen_zero(whereweare) && count) { while (!ast_strlen_zero(whereweare) && count) {
/* Assume we're copying the whole remaining string */ /* Assume we're copying the whole remaining string */
@@ -1617,6 +1617,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
count -= pos; count -= pos;
cp2 += pos; cp2 += pos;
whereweare += pos; whereweare += pos;
*cp2 = 0;
} }
if (nextvar) { if (nextvar) {
@@ -1640,7 +1641,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
vare++; vare++;
} }
if (brackets) if (brackets)
ast_log(LOG_NOTICE, "Error in extension logic (missing '}')\n"); ast_log(LOG_WARNING, "Error in extension logic (missing '}')\n");
len = vare - vars - 1; len = vare - vars - 1;
/* Skip totally over variable string */ /* Skip totally over variable string */
@@ -1657,7 +1658,6 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
if (!ltmp) if (!ltmp)
ltmp = alloca(VAR_BUF_SIZE); ltmp = alloca(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);
vars = ltmp; vars = ltmp;
} else { } else {
@@ -1703,6 +1703,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
memcpy(cp2, cp4, length); memcpy(cp2, cp4, length);
count -= length; count -= length;
cp2 += length; cp2 += length;
*cp2 = 0;
} }
} else if (nextexp) { } else if (nextexp) {
/* We have an expression. Find the start and end, and determine /* We have an expression. Find the start and end, and determine
@@ -1713,7 +1714,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
needsub = 0; needsub = 0;
/* Find the end of it */ /* Find the end of it */
while(brackets && *vare) { while (brackets && *vare) {
if ((vare[0] == '$') && (vare[1] == '[')) { if ((vare[0] == '$') && (vare[1] == '[')) {
needsub++; needsub++;
brackets++; brackets++;
@@ -1729,7 +1730,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
vare++; vare++;
} }
if (brackets) if (brackets)
ast_log(LOG_NOTICE, "Error in extension logic (missing ']')\n"); ast_log(LOG_WARNING, "Error in extension logic (missing ']')\n");
len = vare - vars - 1; len = vare - vars - 1;
/* Skip totally over expression */ /* Skip totally over expression */
@@ -1746,7 +1747,6 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
if (!ltmp) if (!ltmp)
ltmp = alloca(VAR_BUF_SIZE); ltmp = alloca(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);
vars = ltmp; vars = ltmp;
} else { } else {
@@ -1760,6 +1760,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
ast_log(LOG_DEBUG, "Expression result is '%s'\n", cp2); ast_log(LOG_DEBUG, "Expression result is '%s'\n", cp2);
count -= length; count -= length;
cp2 += length; cp2 += length;
*cp2 = 0;
} }
} }
} }