]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
prepare_for_detach: don't release scoped_restore at the end
authorPedro Alves <pedro@palves.net>
Mon, 11 Jan 2021 18:52:12 +0000 (18:52 +0000)
committerPedro Alves <pedro@palves.net>
Tue, 12 Jan 2021 22:52:56 +0000 (22:52 +0000)
After detaching from a process, the inf->detaching flag is
inadvertently left set to true.  If you afterwards reuse the same
inferior to start a new process, GDB will mishave...

The problem is that prepare_for_detach discards the scoped_restore at
the end, while the intention is for the flag to be set only for the
duration of prepare_for_detach.

This was already a bug in the original commit that added
prepare_for_detach, commit 24291992dac3 ("PR gdb/11321"), by yours
truly.  Back then, we still used cleanups, and the function called
discard_cleanups instead of do_cleanups, by mistake.

gdb/ChangeLog:

* infrun.c (prepare_for_detach): Don't release scoped_restore at
the end.

gdb/infrun.c

index b62e74d3dab42cf34292358c654409790bc87a00..fc7ba745737f57a1146a4c669d7de06095d3c751 100644 (file)
@@ -3612,8 +3612,6 @@ prepare_for_detach (void)
          error (_("Program exited while detaching"));
        }
     }
-
-  restore_detaching.release ();
 }
 
 /* Wait for control to return from inferior to debugger.