[asterisk-commits] murf: trunk r89422 - /trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: murf
Date: Mon Nov 19 11:18:26 2007
New Revision: 89422

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89422
Log:
a correction to code involved in an extension removal

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=89422&r1=89421&r2=89422
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon Nov 19 11:18:26 2007
@@ -3705,10 +3705,10 @@
 			 * 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... */