Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv25918
Modified Files:
pbx.c
Log Message:
Don't crash on recursive show extension [EMAIL PROTECTED]
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- pbx.c 16 Sep 2005 18:11:00 -0000 1.276
+++ pbx.c 24 Sep 2005 14:19:00 -0000 1.277
@@ -3281,7 +3281,7 @@
int extension_existence;
};
-static int show_dialplan_helper(int fd, char *context, char *exten, struct
dialplan_counters *dpc, struct ast_include *rinclude)
+static int show_dialplan_helper(int fd, char *context, char *exten, struct
dialplan_counters *dpc, struct ast_include *rinclude, int includecount, char
*includes[])
{
struct ast_context *c;
int res=0, old_total_exten = dpc->total_exten;
@@ -3406,7 +3406,24 @@
ast_get_include_name(i));
if (exten) {
/* Check all includes for the
requested extension */
- show_dialplan_helper(fd, (char
*)ast_get_include_name(i), exten, dpc, i);
+ if (includecount >=
AST_PBX_MAX_STACK) {
+ ast_log(LOG_NOTICE,
"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] = (char *)ast_get_include_name(i);
+
show_dialplan_helper(fd, (char *)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 {
ast_cli(fd, " Include =>
%-45s [%s]\n",
buf,
ast_get_include_registrar(i));
@@ -3456,7 +3473,7 @@
char *exten = NULL, *context = NULL;
/* Variables used for different counters */
struct dialplan_counters counters;
-
+ char *incstack[AST_PBX_MAX_STACK];
memset(&counters, 0, sizeof(counters));
if (argc != 2 && argc != 3)
@@ -3476,17 +3493,17 @@
exten = NULL;
if (ast_strlen_zero(context))
context = NULL;
- show_dialplan_helper(fd, context, exten, &counters,
NULL);
+ show_dialplan_helper(fd, context, exten, &counters,
NULL, 0, incstack);
} else {
/* no '@' char, only context given */
context = argv[2];
if (ast_strlen_zero(context))
context = NULL;
- show_dialplan_helper(fd, context, exten, &counters,
NULL);
+ show_dialplan_helper(fd, context, exten, &counters,
NULL, 0, incstack);
}
} else {
/* Show complete dial plan */
- show_dialplan_helper(fd, NULL, NULL, &counters, NULL);
+ show_dialplan_helper(fd, NULL, NULL, &counters, NULL, 0,
incstack);
}
/* check for input failure and throw some error messages */
@@ -3535,7 +3552,8 @@
"Show dialplan hints", show_hints_help },
};
-int ast_unregister_application(const char *app) {
+int ast_unregister_application(const char *app)
+{
struct ast_app *tmp, *tmpl = NULL;
if (ast_mutex_lock(&applock)) {
ast_log(LOG_ERROR, "Unable to lock application list\n");
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
