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

pbx.c: Prevent infinite recursion in manager_show_dialplan_helper.

Browse Source 
Previously, if context A was including context B and context B was including
context A, i.e. if there was a circular dependency between contexts, then
calling manager_show_dialplan_helper could lead to an infinite recursion,
resulting in a crash.

This commit applies the same solution as the one implemented in the
show_dialplan_helper function. The manager_show_dialplan_helper and
show_dialplan_helper functions contain lots of code in common, but the former
was missing the "infinite recursion avoidance" code.

ASTERISK-26226 #close

Change-Id: I1aea85133c21787226f4f8442253a93000aa0897
This commit is contained in:
Etienne Lessard
2016-08-29 08:07:38 -04:00
parent 9dfd4916a8
commit f9dc20b8cb
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/pbx.c
View File

@@ -5794,7 +5794,8 @@ static void manager_dpsendack(struct mansession *s, const struct message *m)
static int manager_show_dialplan_helper(struct mansession *s, const struct message *m, static int manager_show_dialplan_helper(struct mansession *s, const struct message *m,
const char *actionidtext, const char *context, const char *actionidtext, const char *context,
const char *exten, struct dialplan_counters *dpc, const char *exten, struct dialplan_counters *dpc,
const struct ast_include *rinclude) const struct ast_include *rinclude,
int includecount, const char *includes[])
{ {
struct ast_context *c; struct ast_context *c;
int res = 0, old_total_exten = dpc->total_exten; int res = 0, old_total_exten = dpc->total_exten;
@@ -5876,7 +5877,24 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
if (exten) { if (exten) {
/* Check all includes for the requested extension */ /* Check all includes for the requested extension */
manager_show_dialplan_helper(s, m, actionidtext, ast_get_include_name(i), exten, dpc, i); if (includecount >= AST_PBX_MAX_STACK) {
ast_log(LOG_WARNING, "Maximum include depth exceeded!\n");
} else {
int dupe = 0;
int x;
for (x = 0; x < includecount; x++) {
if (!strcasecmp(includes[x], ast_get_include_name(i))) {
dupe++;
break;
}
}
if (!dupe) {
includes[includecount] = ast_get_include_name(i);
manager_show_dialplan_helper(s, m, actionidtext, ast_get_include_name(i), exten, dpc, i, includecount + 1, includes);
} else {
ast_log(LOG_WARNING, "Avoiding circular include of %s within %s\n", ast_get_include_name(i), context);
}
}
} else { } else {
if (!dpc->total_items++) if (!dpc->total_items++)
manager_dpsendack(s, m); manager_dpsendack(s, m);
@@ -5932,6 +5950,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m)
{ {
const char *exten, *context; const char *exten, *context;
const char *id = astman_get_header(m, "ActionID"); const char *id = astman_get_header(m, "ActionID");
const char *incstack[AST_PBX_MAX_STACK];
char idtext[256]; char idtext[256];
/* Variables used for different counters */ /* Variables used for different counters */
@@ -5947,7 +5966,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m)
exten = astman_get_header(m, "Extension"); exten = astman_get_header(m, "Extension");
context = astman_get_header(m, "Context"); context = astman_get_header(m, "Context");
manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL); manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL, 0, incstack);
if (!ast_strlen_zero(context) && !counters.context_existence) { if (!ast_strlen_zero(context) && !counters.context_existence) {
char errorbuf[BUFSIZ]; char errorbuf[BUFSIZ];