mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Backport a minor bug fix from trunk that I found while doing random code
cleanup. Properly break out of the loop when a context isn't found when verify that includes are valid. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@105591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
16
main/pbx.c
16
main/pbx.c
@@ -6305,12 +6305,16 @@ int ast_context_verify_includes(struct ast_context *con)
|
||||
struct ast_include *inc = NULL;
|
||||
int res = 0;
|
||||
|
||||
while ( (inc = ast_walk_context_includes(con, inc)) )
|
||||
if (!ast_context_find(inc->rname)) {
|
||||
res = -1;
|
||||
ast_log(LOG_WARNING, "Context '%s' tries includes nonexistent context '%s'\n",
|
||||
ast_get_context_name(con), inc->rname);
|
||||
}
|
||||
while ( (inc = ast_walk_context_includes(con, inc)) ) {
|
||||
if (ast_context_find(inc->rname))
|
||||
continue;
|
||||
|
||||
res = -1;
|
||||
ast_log(LOG_WARNING, "Context '%s' tries includes nonexistent context '%s'\n",
|
||||
ast_get_context_name(con), inc->rname);
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user