From d22968af17f64ed5883f9cccfed0f0337dc3bc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Mon, 24 Jul 2006 11:54:53 +0000 Subject: [PATCH] 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. --- Misc/NEWS | 3 +++ PC/getpathp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 7a6e22d563d..eee36c606d8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.5 release candidate 1? 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 2bd3f2653fd..729d2e4736b 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -297,6 +297,10 @@ getpythonregpath(HKEY keyBase, int skipcore) } 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) {