From 40425a24bf5c09b45dcac5c124749e07af1aa3f0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 4 Mar 2008 04:31:29 +0000 Subject: [PATCH] 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 --- main/pbx.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 05e3b2d451..fe3252c0d3 100644 --- a/main/pbx.c +++ b/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; }