From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 4 Feb 2017 23:39:21 +0000 (-0800)
Subject: Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
X-Git-Tag: v3.6.1rc1~107^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d46ae7d12d2cbe4c5b2bd7b023dd37ff12dec68;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index fc8b3ade50..8419915c8e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: XXXX-XX-XX
 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.
 
diff --git a/Modules/main.c b/Modules/main.c
index e4c955e011..75ee2f607c 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -223,7 +223,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));
@@ -248,7 +248,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;
     }