Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].

This commit is contained in:
Steve Dower 2017-02-04 15:39:38 -08:00
parent 5f9193a6ed 6d46ae7d12
commit c008ddeb21
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 3.6.1 release candidate 1?
Core and Builtins
-----------------
- Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
- Issue #29337: Fixed possible BytesWarning when compare the code objects.
Warnings could be emitted at compile time.

14
Modules/main.c
View File

@ -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;
}