summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Murphy <murf@digium.com>2007-11-19 17:18:26 +0000
committerSteve Murphy <murf@digium.com>2007-11-19 17:18:26 +0000
commit406f6f2909a84f30d730b336a05993628a15ac0c (patch)
treed169fb5b347ae72dd5afaf2ed7e2d0cecade4503
parent67f044d42a5b67198426e3a25a0ac81345d116eb (diff)
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
-rw-r--r--main/pbx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 212989854..7c35d5eeb 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... */