Commit 6d46ae7d authored by Steve Dower's avatar Steve Dower

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

parent 21fae03e
...@@ -10,6 +10,8 @@ Release date: XXXX-XX-XX ...@@ -10,6 +10,8 @@ Release date: XXXX-XX-XX
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
- Issue #29337: Fixed possible BytesWarning when compare the code objects. - Issue #29337: Fixed possible BytesWarning when compare the code objects.
Warnings could be emitted at compile time. Warnings could be emitted at compile time.
......
...@@ -223,7 +223,7 @@ static int RunModule(wchar_t *modname, int set_argv0) ...@@ -223,7 +223,7 @@ static int RunModule(wchar_t *modname, int set_argv0)
static int static int
RunMainFromImporter(wchar_t *filename) RunMainFromImporter(wchar_t *filename)
{ {
PyObject *argv0 = NULL, *importer, *sys_path; PyObject *argv0 = NULL, *importer, *sys_path, *sys_path0;
int sts; int sts;
argv0 = PyUnicode_FromWideChar(filename, wcslen(filename)); argv0 = PyUnicode_FromWideChar(filename, wcslen(filename));
...@@ -248,7 +248,17 @@ RunMainFromImporter(wchar_t *filename) ...@@ -248,7 +248,17 @@ RunMainFromImporter(wchar_t *filename)
PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path"); PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path");
goto error; 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; argv0 = NULL;
goto error; goto error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment