Fix insight crash when setting pending breakpoints:

2008-09-19  Denis Pilat  <denis.pilat@st.com>

	* generic/gdbtk-bp.c (gdb_get_breakpoint_info): Manage the case of NULL
	location to handle pending breakpoint in a better way.
	(gdb_find_bp_at_addr): Likewise.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 9222c0d..6d856d9 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-19  Denis Pilat  <denis.pilat@st.com>
+
+       * generic/gdbtk-bp.c (gdb_get_breakpoint_info): Manage the case of NULL
+       location to handle pending breakpoint in a better way.
+       (gdb_find_bp_at_addr): Likewise.
+
 2008-09-18  Keith Seitz  <keiths@redhat.com>
 
        From Pedro Alves  <pedro@codesourcery.com>:

diff --git a/gdb/gdbtk/generic/gdbtk-bp.c b/gdb/gdbtk/generic/gdbtk-bp.c
index 2d56a43..ec991b7 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-bp.c
+++ b/gdb/gdbtk/generic/gdbtk-bp.c
@@ -221,7 +221,7 @@ gdb_find_bp_at_addr (ClientData clientData, Tcl_Interp *interp,
   Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
   for (i = 0; i < breakpoint_list_size; i++)
     {
-      if (breakpoint_list[i] != NULL
+      if (breakpoint_list[i] != NULL && breakpoint_list[i]->loc != NULL
          && breakpoint_list[i]->loc->address == addr)
        Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
                                  Tcl_NewIntObj (i));
@@ -290,6 +290,7 @@ gdb_get_breakpoint_info (ClientData clientData, Tcl_Interp *interp, int objc,
   int bpnum;
   struct breakpoint *b;
   char *funcname, *filename;
+  int isPending = 0;
 
   Tcl_Obj *new_obj;
 
@@ -312,27 +313,42 @@ gdb_get_breakpoint_info (ClientData clientData, Tcl_Interp *interp, int objc,
       return TCL_ERROR;
     }
 
-  sal = find_pc_line (b->loc->address, 0);
-
-  filename = symtab_to_filename (sal.symtab);
-  if (filename == NULL)
-    filename = "";
-
+  isPending = (b->loc == NULL);
   Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-                           Tcl_NewStringObj (filename, -1));
+  /* Pending breakpoints will display "<PENDING>" as the file name and the 
+     user expression into the Function field of the breakpoint view.
+    "0" and "0" in the line number and address field.  */
+  if (isPending)
+    {
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewStringObj ("<PENDING>", -1));
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewStringObj (b->addr_string, -1));
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewIntObj (0));
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewIntObj (0));
+    }
+  else
+    {
+      sal = find_pc_line (b->loc->address, 0);
 
-  funcname = pc_function_name (b->loc->address);
-  new_obj = Tcl_NewStringObj (funcname, -1);
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, new_obj);
+      filename = symtab_to_filename (sal.symtab);
+      if (filename == NULL)
+        filename = "";
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewStringObj (filename, -1));
+      funcname = pc_function_name (b->loc->address);
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewStringObj (funcname, -1));
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewIntObj (b->line_number));
+      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
+                                Tcl_NewStringObj (core_addr_to_string
+                               (b->loc->address), -1));
+  }
 
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-                           Tcl_NewIntObj (b->line_number));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-                           Tcl_NewStringObj (core_addr_to_string
-                                             (b->loc->address),
-                                             -1));
-  Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
                            Tcl_NewStringObj (bptypes[b->type], -1));
   Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
                            Tcl_NewBooleanObj (b->enable_state == bp_enabled));