From 5bc0d8d32450c6e256c074a00823e681b85fc505 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 1 Mar 2007 00:08:18 +0000
Subject: [PATCH] Minor code cleanup... nothing to write home about.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/pbx.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/main/pbx.c b/main/pbx.c
index f129667302..558abdae33 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -934,17 +934,17 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan,
q->swo = NULL;
q->data = NULL;
q->foundcontext = NULL;
- }
- /* Check for stack overflow */
- if (q->stacklen >= AST_PBX_MAX_STACK) {
+ } else if (q->stacklen >= AST_PBX_MAX_STACK) {
ast_log(LOG_WARNING, "Maximum PBX stack exceeded\n");
return NULL;
}
+
/* Check first to see if we've already been checked */
for (x = 0; x < q->stacklen; x++) {
if (!strcasecmp(q->incstack[x], context))
return NULL;
}
+
if (bypass) /* bypass means we only look there */
tmp = bypass;
else { /* look in contexts */
@@ -956,6 +956,7 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan,
if (!tmp)
return NULL;
}
+
if (q->status < STATUS_NO_EXTENSION)
q->status = STATUS_NO_EXTENSION;
--
GitLab