mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Issue #12650: Fix a race condition where a subprocess.Popen could leak
resources (FD/zombie) when killed at the wrong time.
This commit is contained in:
parent
5ad517a7d9
commit
134a8baed9
3 changed files with 69 additions and 1 deletions
|
@ -429,12 +429,16 @@ try:
|
|||
except:
|
||||
MAXFD = 256
|
||||
|
||||
# This lists holds Popen instances for which the underlying process had not
|
||||
# exited at the time its __del__ method got called: those processes are wait()ed
|
||||
# for synchronously from _cleanup() when a new Popen object is created, to avoid
|
||||
# zombie processes.
|
||||
_active = []
|
||||
|
||||
def _cleanup():
|
||||
for inst in _active[:]:
|
||||
res = inst._internal_poll(_deadstate=sys.maxsize)
|
||||
if res is not None and res >= 0:
|
||||
if res is not None:
|
||||
try:
|
||||
_active.remove(inst)
|
||||
except ValueError:
|
||||
|
@ -1191,6 +1195,7 @@ class Popen(object):
|
|||
errread, errwrite,
|
||||
errpipe_read, errpipe_write,
|
||||
restore_signals, start_new_session, preexec_fn)
|
||||
self._child_created = True
|
||||
else:
|
||||
# Pure Python implementation: It is not thread safe.
|
||||
# This implementation may deadlock in the child if your
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue