diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-11-20 02:33:39 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-11-20 02:33:39 (GMT) |
| commit | 11f4326ca146ac744ebdfc23149fe3fb9a89e812 (patch) | |
| tree | fd749af10f00918d40cfd6cf2777d9bf5a0d6b30 | |
| parent | ca4b252fba0a0540475f2edebfcabdf80f5cecdf (diff) | |
| download | cpython-11f4326ca146ac744ebdfc23149fe3fb9a89e812.zip cpython-11f4326ca146ac744ebdfc23149fe3fb9a89e812.tar.gz cpython-11f4326ca146ac744ebdfc23149fe3fb9a89e812.tar.bz2 | |
Issue #28732: Fix crash in os.spawnv() with no elements in args
Prevents crashes in some other posixmodule.c functions
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 16 |
2 files changed, 18 insertions, 0 deletions
@@ -121,6 +121,8 @@ Core and Builtins Library ------- +- Issue #28732: Fix crash in os.spawnv() with no elements in args + - Issue #28485: Always raise ValueError for negative compileall.compile_dir(workers=...) parameter, even when multithreading is unavailable. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 5a23824..6170ff7 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5186,6 +5186,16 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) "spawnv() arg 2 must be a tuple or list"); return NULL; } +#ifdef MS_WINDOWS + /* Avoid changing behavior in maintenance release, but + the previous Windows behavior was to crash, so this + is a "compatible" improvement. */ + if (argc == 0) { + PyErr_SetString(PyExc_ValueError, + "spawnv() arg 2 cannot be empty"); + return NULL; + } +#endif argvlist = PyMem_NEW(char *, argc+1); if (argvlist == NULL) { @@ -5207,7 +5217,9 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) mode = _P_OVERLAY; Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH spawnval = _spawnv(mode, path_char, argvlist); + _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS free_string_array(argvlist, argc); @@ -5297,7 +5309,9 @@ os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, mode = _P_OVERLAY; Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH spawnval = _spawnve(mode, path_char, argvlist, envlist); + _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS if (spawnval == -1) @@ -7022,7 +7036,9 @@ os_waitpid_impl(PyObject *module, Py_intptr_t pid, int options) do { Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH res = _cwait(&status, pid, options); + _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS } while (res < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); if (res < 0) |