sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pbx.c: Warn if there are too many includes in a context. 

The PBX core uses the stack when it comes to includes, which
means that a context can only contain strictly fewer than
AST_PBX_MAX_STACK includes. If this is exceeded, then warnings
will be emitted for each number of includes beyond this if
searching for an extension in the including context, and if
the extension's inclusion is beyond the stack size, it will
simply not be found.

To address this, we now check if there are too many includes
in a context when the dialplan is reloaded so that if there
is an issue, the user is aware of at "compile time" as opposed
to "run time" only. Secondly, more details are printed out
when this message is encountered so it's clear what has happened.

ASTERISK-26719

Change-Id: Ia3700452e75a7af3391b3e82ee69f06a669f8958
This commit is contained in:
Naveen Albert 2022-03-05 16:26:42 +00:00 committed by Friendly Automation
parent 4abd75b1d4
commit 8442c83229
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/pbx.c
View File

@ -2506,7 +2506,7 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan,
q->data = NULL;
q->foundcontext = NULL;
} else if (q->stacklen >= AST_PBX_MAX_STACK) {
ast_log(LOG_WARNING, "Maximum PBX stack exceeded\n");
ast_log(LOG_WARNING, "Maximum PBX stack (%d) exceeded. Too many includes?\n", AST_PBX_MAX_STACK);
return NULL;
}
@ -8771,8 +8771,14 @@ int ast_context_verify_includes(struct ast_context *con)
{
int idx;
int res = 0;
int includecount = ast_context_includes_count(con);
for (idx = 0; idx < ast_context_includes_count(con); idx++) {
if (includecount >= AST_PBX_MAX_STACK) {
ast_log(LOG_WARNING, "Context %s contains too many includes (%d). Maximum is %d.\n",
ast_get_context_name(con), includecount, AST_PBX_MAX_STACK);
}
for (idx = 0; idx < includecount; idx++) {
const struct ast_include *inc = ast_context_includes_get(con, idx);
if (ast_context_find(include_rname(inc))) {