From 406f6f2909a84f30d730b336a05993628a15ac0c Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Mon, 19 Nov 2007 17:18:26 +0000 Subject: [PATCH] a correction to code involved in an extension removal git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89422 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 2129898545..7c35d5eebb 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3705,10 +3705,10 @@ int ast_context_remove_extension2(struct ast_context *con, const char *extension * The next node is either the next priority or the next extension */ struct ast_exten *next_node = peer->peer ? peer->peer : peer->next; - if (next_node == peer->peer) { + if (next_node && next_node == peer->peer) { next_node->peer_tree = exten->peer_tree; /* move the priority hash tabs over */ exten->peer_tree = 0; - next_node->peer_tree = exten->peer_label_tree; + next_node->peer_label_tree = exten->peer_label_tree; exten->peer_label_tree = 0; } if (!prev_exten) { /* change the root... */