Fix crash when a variable object being deleted

 	has any of its children deleted previously.

	* varobj.c (delete_variable_1): Don't recurse
	into deleted children.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eac5d71aa81c76909f77a0c7596b4f65111cf352..8cd2d6dac4936f9556230146421a8dfa097ed671 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-08  Vladimir Prus  <vladimir@codesourcery.com>
+       
+       Fix crash when a variable object being deleted
+       has any of its children deleted previously.
+
+       * varobj.c (delete_variable_1): Don't recurse
+       into deleted children.
+       
 2007-10-29  Joel Brobecker  <brobecker@adacore.com>
 
        * version.in: Set version to 6.7.1.20071029-cvs.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cbaefb2e32fde2ad32916a69cee14283070db958..c2ce65d9220248418e71606e5fddeb2113df7d85 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  Vladimir Prus  <vladimir@codesourcery.com>
+
+       * gdb.mi/mi-var-child.c (do_child_deletion): New.
+       * gdb.mi/mi-var-child.exp: Run child_deletion tests.
+
 2007-10-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdb.server/server-run.exp: Test for dynamic linker symbols.

diff --git a/gdb/testsuite/gdb.mi/mi-var-child.c b/gdb/testsuite/gdb.mi/mi-var-child.c
index 393efd24d57ad45e142f03800954634ef06aea6e..406f0e2e2c70ae0f2214483c3202573e60d05ca5 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child.c
+++ b/gdb/testsuite/gdb.mi/mi-var-child.c
@@ -306,6 +306,29 @@ do_special_tests (void)
   incr_a(2);
 }
 
+struct very_simple_struct
+{
+  int a;
+  int b;
+};
+
+int
+do_child_deletion (void)
+{
+  /*: BEGIN: child_deletion :*/
+  struct very_simple_struct s = {1, 2};
+  /*:
+    mi_create_varobj S s "create varobj for s"
+    mi_list_varobj_children S {{S.a a 0 int} {S.b b 0 int}}    \
+       "list children of S"
+    mi_delete_varobj S.a "delete S.a"    
+    mi_delete_varobj S.b "delete S.b"
+    mi_delete_varobj S "delete S"
+    :*/
+  return 99;
+  /*: END: child_deletion :*/  
+}
+
 int
 main (int argc, char *argv [])
 {
@@ -313,6 +336,7 @@ main (int argc, char *argv [])
   do_block_tests ();
   do_children_tests ();
   do_special_tests ();
+  do_child_deletion ();
   exit (0);
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index aad9727c39320025924f7fc31396e141efbb9ff3..c26cada8aa6b5786ad9c43d5e10d4d9439826f83 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -1227,7 +1227,9 @@ mi_gdb_test "-var-update *" \
        "\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.next.long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
        "update all vars psnp->next->next->long_ptr (and 2.long_ptr) changed"
 
+mi_prepare_inline_tests $srcfile
 
+mi_run_inline_test child_deletion
 
 
 mi_gdb_exit

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 5ea81fa3ef66bb7830a0ad6428864de5198cdfea..84d308548af062b236817b3694b70032b1cc0d7f 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1295,6 +1295,8 @@ delete_variable_1 (struct cpstack **resultp, int *delcountp,
   for (i = 0; i < VEC_length (varobj_p, var->children); ++i)
     {   
       varobj_p child = VEC_index (varobj_p, var->children, i);
+      if (!child)
+       continue;
       if (!remove_from_parent_p)
        child->parent = NULL;
       delete_variable_1 (resultp, delcountp, child, 0, only_children_p);