* breakpoint.c (watch_command_1): When the watchpoint isn't local

to any frame, initialize watchpoint_frame using null_frame_id, not
a memset.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3244ea28302fca84531b2492af9b041850368b9c..d5a4fabbff79996b26c86f45ec5bc464006ed27b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-28  Jim Blandy  <jimb@codesourcery.com>
+
+       * breakpoint.c (watch_command_1): When the watchpoint isn't local
+       to any frame, initialize watchpoint_frame using null_frame_id, not
+       a memset.
+
 2007-11-28  Vladimir Prus  <vladimir@codesourcery.com>
 
        * infrun.c (resume): Set right thread even if 

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2203f6ee3d64788adcd1dcb1e93204ecd0cb6e00..f8e3cef88b4132428a803be4f80bc24b7e616e26 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5996,7 +5996,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty)
   if (frame)
     b->watchpoint_frame = get_frame_id (frame);
   else
-    memset (&b->watchpoint_frame, 0, sizeof (b->watchpoint_frame));
+    b->watchpoint_frame = null_frame_id;
 
   if (scope_breakpoint != NULL)
     {