Patch #1232023: Don't include empty path component from registry,
so that the current directory does not get added to sys.path.
Also fixes #1526785.
diff --git a/Misc/NEWS b/Misc/NEWS
index 7a6e22d..eee36c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and builtins
-----------------
+- Patch #1232023: Stop including current directory in search
+ path on Windows.
+
- Fix some potential crashes found with failmalloc.
- Fix warnings reported by Klocwork's static analysis tool.
diff --git a/PC/getpathp.c b/PC/getpathp.c
index 2bd3f26..729d2e4 100644
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -297,6 +297,10 @@
}
RegCloseKey(subKey);
}
+
+ /* return null if no path to return */
+ if (dataSize == 0) goto done;
+
/* original datasize from RegQueryInfo doesn't include the \0 */
dataBuf = malloc((dataSize+1) * sizeof(TCHAR));
if (dataBuf) {