"expand_tree()" and "collapse_tree()" can be called on leaf nodes, so

don't blow up if "finfo->tree_type" is -1, just don't expand anything.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5127 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index b586190051a8ebf7e2e42a6149a62d20c1f0d870..e93dfc2322586855a3301244c3c124571667a783 100644 (file)
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
 /* proto_draw.c
  * Routines for GTK+ packet display
  *
- * $Id: proto_draw.c,v 1.50 2002/04/01 02:00:53 guy Exp $
+ * $Id: proto_draw.c,v 1.51 2002/04/08 19:10:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -162,28 +162,38 @@ static void
 expand_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data _U_)
 {
        field_info      *finfo;
-       gboolean        *val;
 
        finfo = gtk_ctree_node_get_row_data( ctree, node);
        g_assert(finfo);
-       g_assert(finfo->tree_type >= 0 && finfo->tree_type < num_tree_types);
 
-       val = &tree_is_expanded[finfo->tree_type];
-       *val = TRUE;
+       /*
+        * Nodes with "finfo->tree_type" of -1 have no ett_ value, and
+        * are thus presumably leaf nodes and cannot be expanded.
+        */
+       if (finfo->tree_type != -1) {
+               g_assert(finfo->tree_type >= 0 &&
+                   finfo->tree_type < num_tree_types);
+               tree_is_expanded[finfo->tree_type] = TRUE;
+       }
 }
 
 static void
 collapse_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data _U_)
 {
        field_info      *finfo;
-       gboolean        *val;
 
        finfo = gtk_ctree_node_get_row_data( ctree, node);
        g_assert(finfo);
-       g_assert(finfo->tree_type >= 0 && finfo->tree_type < num_tree_types);
 
-       val = &tree_is_expanded[finfo->tree_type];
-       *val = FALSE;
+       /*
+        * Nodes with "finfo->tree_type" of -1 have no ett_ value, and
+        * are thus presumably leaf nodes and cannot be collapsed.
+        */
+       if (finfo->tree_type != -1) {
+               g_assert(finfo->tree_type >= 0 &&
+                   finfo->tree_type < num_tree_types);
+               tree_is_expanded[finfo->tree_type] = FALSE;
+       }
 }
 
 static void