diff options
author | Gregory P. Smith <greg@krypto.org> | 2015-11-16 02:19:10 (GMT) |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2015-11-16 02:19:10 (GMT) |
commit | a0c9caad66f01328155177180df1c46fe7c62e57 (patch) | |
tree | 4a3d164d0f21a554dc12d571d567b817972c6bb2 /Lib | |
parent | 025a1fd9907bb439db9a812c78b8f18dbf4bad9e (diff) | |
download | cpython-a0c9caad66f01328155177180df1c46fe7c62e57.zip cpython-a0c9caad66f01328155177180df1c46fe7c62e57.tar.gz cpython-a0c9caad66f01328155177180df1c46fe7c62e57.tar.bz2 |
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.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/subprocess.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index f11e538..abf43e5 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1241,8 +1241,10 @@ class Popen(object): return (stdout, stderr) 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: self.terminate() elif sig == signal.CTRL_C_EVENT: @@ -1253,8 +1255,10 @@ class Popen(object): raise ValueError("Unsupported signal: {}".format(sig)) 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: _winapi.TerminateProcess(self._handle, 1) except PermissionError: @@ -1678,9 +1682,10 @@ class Popen(object): def send_signal(self, sig): - """Send a signal to the process - """ - os.kill(self.pid, sig) + """Send a signal to the process.""" + # Skip signalling a process that we know has already died. + if self.returncode is None: + os.kill(self.pid, sig) def terminate(self): """Terminate the process with SIGTERM |