2012-07-24 Marc Khouzam <marc.khouzam@ericsson.com>

	* breakpoint.c (create_breakpoint): Store condition for pending
	breakpoints.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e99445c8ba3fa629b94983cbbb9754d0be86026..76d1e74067d335bd9babdfe8153373f76742dcd8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-24  Marc Khouzam  <marc.khouzam@ericsson.com>
+
+       * breakpoint.c (create_breakpoint): Store condition for pending
+       breakpoints.
+
 2012-07-23  Keith Seitz  <keiths@redhat.com>
 
        * linespec.c (convert_linespec_to_sal): Don't add

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 6b9faf33e0c1d74eb15b1ddcb8fc86daa6b681fa..78fffd34e9eb7233b75c67c29831444210b5617c 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9548,7 +9548,18 @@ create_breakpoint (struct gdbarch *gdbarch,
       init_raw_breakpoint_without_location (b, gdbarch, type_wanted, ops);
 
       b->addr_string = copy_arg;
-      b->cond_string = NULL;
+      if (parse_condition_and_thread)
+       b->cond_string = NULL;
+      else
+       {
+         /* Create a private copy of condition string.  */
+         if (cond_string)
+           {
+             cond_string = xstrdup (cond_string);
+             make_cleanup (xfree, cond_string);
+           }
+         b->cond_string = cond_string;
+       }
       b->extra_string = NULL;
       b->ignore_count = ignore_count;
       b->disposition = tempflag ? disp_del : disp_donttouch;