diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-12-01 08:12:24 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-12-01 08:12:24 (GMT) |
| commit | 361e30c17a7973874334597903afb3ba5a477f49 (patch) | |
| tree | a1b01b9f99a3705ae3d949fb683c234c62f317cc /Modules/_posixsubprocess.c | |
| parent | 1eda9e7c3074bfe37674c8140b3d02bf94caf4f3 (diff) | |
| download | cpython-361e30c17a7973874334597903afb3ba5a477f49.zip cpython-361e30c17a7973874334597903afb3ba5a477f49.tar.gz cpython-361e30c17a7973874334597903afb3ba5a477f49.tar.bz2 | |
Undo supposed fix for Issue #15798 until I understand why this is
causing test_multiprocessing_forkserver and test_multiprocessing_spawn
failures on head (3.4).
Diffstat (limited to 'Modules/_posixsubprocess.c')
| -rw-r--r-- | Modules/_posixsubprocess.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index fa1975c..8d65530 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -449,7 +449,7 @@ child_exec(char *const exec_array[], local_max_fd = max_fd; #endif /* TODO HP-UX could use pstat_getproc() if anyone cares about it. */ - _close_open_fd_range(0, local_max_fd, py_fds_to_keep); + _close_open_fd_range(3, local_max_fd, py_fds_to_keep); } /* This loop matches the Lib/os.py _execvpe()'s PATH search when */ @@ -526,6 +526,10 @@ subprocess_fork_exec(PyObject* self, PyObject *args) &restore_signals, &call_setsid, &preexec_fn)) return NULL; + if (close_fds && errpipe_write < 3) { /* precondition */ + PyErr_SetString(PyExc_ValueError, "errpipe_write must be >= 3"); + return NULL; + } if (PySequence_Length(py_fds_to_keep) < 0) { PyErr_SetString(PyExc_ValueError, "cannot get length of fds_to_keep"); return NULL; |