Commit a6c66b00 authored by Gregory P. Smith's avatar Gregory P. Smith

Fix issue #6973: When we know a subprocess.Popen process has died, do

not allow the send_signal(), terminate(), or kill() methods to do
anything as they could potentially signal a different process.
parents c4035a48 5049a550
...@@ -1333,8 +1333,10 @@ class Popen(object): ...@@ -1333,8 +1333,10 @@ class Popen(object):
return (stdout, stderr) return (stdout, stderr)
def send_signal(self, sig): def send_signal(self, sig):
"""Send a signal to the process """Send a signal to the process."""
""" # Don't signal a process that we know has already died.
if self.returncode is not None:
return
if sig == signal.SIGTERM: if sig == signal.SIGTERM:
self.terminate() self.terminate()
elif sig == signal.CTRL_C_EVENT: elif sig == signal.CTRL_C_EVENT:
...@@ -1345,8 +1347,10 @@ class Popen(object): ...@@ -1345,8 +1347,10 @@ class Popen(object):
raise ValueError("Unsupported signal: {}".format(sig)) raise ValueError("Unsupported signal: {}".format(sig))
def terminate(self): def terminate(self):
"""Terminates the process """Terminates the process."""
""" # Don't terminate a process that we know has already died.
if self.returncode is not None:
return
try: try:
_winapi.TerminateProcess(self._handle, 1) _winapi.TerminateProcess(self._handle, 1)
except PermissionError: except PermissionError:
...@@ -1754,9 +1758,10 @@ class Popen(object): ...@@ -1754,9 +1758,10 @@ class Popen(object):
def send_signal(self, sig): def send_signal(self, sig):
"""Send a signal to the process """Send a signal to the process."""
""" # Skip signalling a process that we know has already died.
os.kill(self.pid, sig) if self.returncode is None:
os.kill(self.pid, sig)
def terminate(self): def terminate(self):
"""Terminate the process with SIGTERM """Terminate the process with SIGTERM
......
...@@ -70,6 +70,10 @@ Core and Builtins ...@@ -70,6 +70,10 @@ Core and Builtins
Library Library
------- -------
- Issue #6973: When we know a subprocess.Popen process has died, do
not allow the send_signal(), terminate(), or kill() methods to do
anything as they could potentially signal a different process.
- Issue #25590: In the Readline completer, only call getattr() once per - Issue #25590: In the Readline completer, only call getattr() once per
attribute. attribute.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment