FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.7] bpo-34658: Fix rare subprocess prexec_fn fork error. (GH-9255) by miss-islington · Pull Request #9256 · python/cpython · GitHub

/ cpython Public

[3.7] bpo-34658: Fix rare subprocess prexec_fn fork error. (GH-9255) #9256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Sep 13, 2018
Conversation 3 Commits 1 Checks 0 Files changed
Merged

[3.7] bpo-34658: Fix rare subprocess prexec_fn fork error. (GH-9255) #9256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2018-09-13-03-59-43.bpo-34658.ykZ-ia.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a rare interpreter unhandled exception state SystemError only seen when
using subprocess with a preexec_fn while an after_parent handler has been
registered with os.register_at_fork and the fork system call fails.
20 changes: 13 additions & 7 deletions Modules/_posixsubprocess.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
char *const *exec_array, *const *argv = NULL, *const *envp = NULL;
Py_ssize_t arg_num;
int need_after_fork = 0;
int saved_errno = 0;

if (!PyArg_ParseTuple(
args, "OOpO!OOiiiiiiiiiiO:fork_exec",
Expand Down Expand Up @@ -700,14 +701,14 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
_exit(255);
return NULL; /* Dead code to avoid a potential compiler warning. */
}
Py_XDECREF(cwd_obj2);

/* Parent (original) process */
if (pid == -1) {
/* Capture the errno exception before errno can be clobbered. */
PyErr_SetFromErrno(PyExc_OSError);
/* Capture errno for the exception. */
saved_errno = errno;
}

/* Parent process */
Py_XDECREF(cwd_obj2);

if (need_after_fork)
PyOS_AfterFork_Parent();
if (envp)
Expand All @@ -723,8 +724,13 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
Py_XDECREF(preexec_fn_args_tuple);
Py_XDECREF(gc_module);

if (pid == -1)
return NULL; /* fork() failed. Exception set earlier. */
if (pid == -1) {
errno = saved_errno;
/* We can't call this above as PyOS_AfterFork_Parent() calls back
* into Python code which would see the unreturned error. */
PyErr_SetFromErrno(PyExc_OSError);
return NULL; /* fork() failed. */
}

return PyLong_FromPid(pid);

Expand Down
Back | FazBrowse Home | New Git URL