aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-19 17:18:26 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-19 17:18:26 +0000
commitb3e3d224967c073bcd52758fd7753d7422b952d0 (patch)
treed169fb5b347ae72dd5afaf2ed7e2d0cecade4503
parent9f89c21eaa8b834adbe45b8bab4ce88c58298c00 (diff)
a correction to code involved in an extension removal
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89422 f38db490-d61c-443f-a65b-d21fe96a405b
-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... */