diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 23:41:12 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 23:41:12 (GMT) |
| commit | 49226e23f630b7bac3b9a44b08e2fdf5a581f478 (patch) | |
| tree | 9f9c4a6f6860e9c17418e9a06f45923bff16387c /Modules/main.c | |
| parent | 824c6fdfaa79f601fa50b99ff1d20e565cdc4120 (diff) | |
| parent | c008ddeb21528d4394fb20156a81f851af79f701 (diff) | |
| download | cpython-49226e23f630b7bac3b9a44b08e2fdf5a581f478.zip cpython-49226e23f630b7bac3b9a44b08e2fdf5a581f478.tar.gz cpython-49226e23f630b7bac3b9a44b08e2fdf5a581f478.tar.bz2 | |
Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
Diffstat (limited to 'Modules/main.c')
| -rw-r--r-- | Modules/main.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Modules/main.c b/Modules/main.c index 020c353..633e757 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -228,7 +228,7 @@ static int RunModule(wchar_t *modname, int set_argv0) static int RunMainFromImporter(wchar_t *filename) { - PyObject *argv0 = NULL, *importer, *sys_path; + PyObject *argv0 = NULL, *importer, *sys_path, *sys_path0; int sts; argv0 = PyUnicode_FromWideChar(filename, wcslen(filename)); @@ -253,7 +253,17 @@ RunMainFromImporter(wchar_t *filename) PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path"); goto error; } - if (PyList_SetItem(sys_path, 0, argv0)) { + sys_path0 = PyList_GetItem(sys_path, 0); + sts = 0; + if (!sys_path0) { + PyErr_Clear(); + sts = PyList_Append(sys_path, argv0); + } else if (PyObject_IsTrue(sys_path0)) { + sts = PyList_Insert(sys_path, 0, argv0); + } else { + sts = PyList_SetItem(sys_path, 0, argv0); + } + if (sts) { argv0 = NULL; goto error; } |