* breakpoint.c (breakpoint_re_set_one): Add missing chunk of

	2004-01-27 double-free fix.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 720dc80..3e5dead 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-31  Daniel Jacobowitz  <drow@mvista.com>
+
+       * breakpoint.c (breakpoint_re_set_one): Add missing chunk of
+       2004-01-27 double-free fix.
+
 2004-01-31  Mark Kettenis  <kettenis@gnu.org>
 
        * sparc-tdep.c (sparc_fetch_wcookie): New function.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a9bd979..4ea0f67 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -6902,7 +6902,12 @@ breakpoint_re_set_one (void *bint)
            {
              s = b->cond_string;
              if (b->cond)
-               xfree (b->cond);
+               {
+                 xfree (b->cond);
+                 /* Avoid re-freeing b->exp if an error during the call
+                    to parse_exp_1.  */
+                 b->cond = NULL;
+               }
              b->cond = parse_exp_1 (&s, block_for_pc (sals.sals[i].pc), 0);
            }