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

put a limit on Macro depth (to combat recursion) (issue #5114)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-07 20:39:20 +00:00
parent 19a4e8fe6d
commit a78f58b4e4
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/app_macro.c
View File

@@ -87,10 +87,10 @@ static int macro_exec(struct ast_channel *chan, void *data)
int res=0; int res=0;
char oldexten[256]=""; char oldexten[256]="";
int oldpriority; int oldpriority;
char pc[80]; char pc[80], depthc[12];
char oldcontext[AST_MAX_CONTEXT] = ""; char oldcontext[AST_MAX_CONTEXT] = "";
char *offsets; char *offsets;
int offset; int offset, depth;
int setmacrocontext=0; int setmacrocontext=0;
int autoloopflag; int autoloopflag;
@@ -105,6 +105,21 @@ static int macro_exec(struct ast_channel *chan, void *data)
return 0; return 0;
} }
/* Count how many levels deep the rabbit hole goes */
tmp = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH");
if (tmp) {
sscanf(tmp, "%d", &depth);
} else {
depth = 0;
}
if (depth >= 7) {
ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n");
return 0;
}
snprintf(depthc, sizeof(depthc), "%d", depth + 1);
pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
tmp = ast_strdupa((char *) data); tmp = ast_strdupa((char *) data);
rest = tmp; rest = tmp;
macro = strsep(&rest, "|"); macro = strsep(&rest, "|");
@@ -174,6 +189,8 @@ static int macro_exec(struct ast_channel *chan, void *data)
autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP); autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP); ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) { while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
/* Reset the macro depth, if it was changed in the last iteration */
pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) { if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
/* Something bad happened, or a hangup has been requested. */ /* Something bad happened, or a hangup has been requested. */
if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) || if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||
@@ -215,6 +232,10 @@ static int macro_exec(struct ast_channel *chan, void *data)
chan->priority++; chan->priority++;
} }
out: out:
/* Reset the depth back to what it was when the routine was entered (like if we called Macro recursively) */
snprintf(depthc, sizeof(depthc), "%d", depth);
pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP); ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
for (x=1; x<argc; x++) { for (x=1; x<argc; x++) {
/* Restore old arguments and delete ours */ /* Restore old arguments and delete ours */