From 28e78778f51cfb840c676bcc243bba0bdca79119 Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Mon, 17 Dec 2007 11:34:45 +0000 Subject: [PATCH] * breakpoint.c (bpstat_stop_status): Check an additional condition before evaluating an expression value. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de51252cdf0..0cec62b32e0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Luis Machado + + * breakpoint.c (bpstat_stop_status): Check an additional + condition before evaluating an expression value. + 2007-12-17 Joel Brobecker * language.h (enum exp_opcode): Add forward declaration. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 651ee893c5c..44c02f05937 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2823,7 +2823,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid) if (b->type == bp_watchpoint_scope) b->related_breakpoint->watchpoint_triggered = watch_triggered_yes; - if (bl->cond) + if (bl->cond && bl->owner->disposition != disp_del_at_next_stop) { /* Need to select the frame, with all that implies so that the conditions will have the right context. */ -- 2.30.2