2012-05-28 Pedro Alves <palves@redhat.com>

	* infrun.c (wait_for_inferior): Move ecss and ecs locals to the
	block that uses them.  Clear ecss before handling each event.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49e7259..197749e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-28  Pedro Alves  <palves@redhat.com>
+
+       * infrun.c (wait_for_inferior): Move ecss and ecs locals to the
+       block that uses them.  Clear ecss before handling each event.
+
 2012-05-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * solib-svr4.c (svr4_current_sos): New comment on

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 50ad217..45b1fe7 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2694,8 +2694,6 @@ void
 wait_for_inferior (void)
 {
   struct cleanup *old_cleanups;
-  struct execution_control_state ecss;
-  struct execution_control_state *ecs;
 
   if (debug_infrun)
     fprintf_unfiltered
@@ -2704,13 +2702,14 @@ wait_for_inferior (void)
   old_cleanups =
     make_cleanup (delete_step_thread_step_resume_breakpoint_cleanup, NULL);
 
-  ecs = &ecss;
-  memset (ecs, 0, sizeof (*ecs));
-
   while (1)
     {
+      struct execution_control_state ecss;
+      struct execution_control_state *ecs = &ecss;
       struct cleanup *old_chain;
 
+      memset (ecs, 0, sizeof (*ecs));
+
       overlay_cache_invalid = 1;
 
       if (deprecated_target_wait_hook)