From 76155d60ce52b4a8b039286df3d5ea30f05bc0a3 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Tue, 22 Apr 2008 21:57:57 +0000 Subject: [PATCH] (closes issue #12469) Reported by: triccyx I had a bit a problem reproducing this in my setup (trying not to disturb my other stuff) but finally, I got it. The problem appears to be that the extension is being added in replace mode, which kinda assumes that the pattern trie has been formed, when in fact, in this case, it was not. The checks being done are not nec. when the tree is not yet formed, as changes like this will be summarized when the trie is formed in the future. I tested the fix, and the crash no longer happens. Feel free to open the bug again if this fix doesn't cure the problem. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114553 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 1aecee7c9e..322303383c 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6467,11 +6467,12 @@ static int add_pri(struct ast_context *con, struct ast_exten *tmp, el->next = tmp; /* The pattern trie points to this exten; replace the pointer, and all will be well */ - - if (x->exten) { /* this test for safety purposes */ - x->exten = tmp; /* replace what would become a bad pointer */ - } else { - ast_log(LOG_ERROR,"Trying to delete an exten from a context, but the pattern tree node returned isn't an extension\n"); + if (x) { /* if the trie isn't formed yet, don't sweat this */ + if (x->exten) { /* this test for safety purposes */ + x->exten = tmp; /* replace what would become a bad pointer */ + } else { + ast_log(LOG_ERROR,"Trying to delete an exten from a context, but the pattern tree node returned isn't an extension\n"); + } } } else { /* We're the very first extension. */ struct match_char *x = add_exten_to_pattern_tree(con, e, 1); @@ -6490,10 +6491,12 @@ static int add_pri(struct ast_context *con, struct ast_exten *tmp, con->root = tmp; /* The pattern trie points to this exten; replace the pointer, and all will be well */ - if (x->exten) { /* this test for safety purposes */ - x->exten = tmp; /* replace what would become a bad pointer */ - } else { - ast_log(LOG_ERROR,"Trying to delete an exten from a context, but the pattern tree node returned isn't an extension\n"); + if (x) { /* if the trie isn't formed yet; no problem */ + if (x->exten) { /* this test for safety purposes */ + x->exten = tmp; /* replace what would become a bad pointer */ + } else { + ast_log(LOG_ERROR,"Trying to delete an exten from a context, but the pattern tree node returned isn't an extension\n"); + } } } if (tmp->priority == PRIORITY_HINT)