mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 02:04:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-46297: Fix interpreter crash on startup with multiple PythonPaths set in registry (GH-30466)

Browse source
This commit is contained in:
Daniel 2022-01-08 00:26:00 +02:00 • committed by GitHub
parent 74d1663580
commit c9dc1f491e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/getpath.py
View file

@ -127,7 +127,7 @@
# checked by looking for the BUILDDIR_TXT file, which contains the
# relative path to the platlib dir. The executable_dir value is
# derived from joining the VPATH preprocessor variable to the
# directory containing pybuilddir.txt. If it is not found, the
# directory containing pybuilddir.txt. If it is not found, the
# BUILD_LANDMARK file is found, which is part of the source tree.
# prefix is then found by searching up for a file that should only
# exist in the source tree, and the stdlib dir is set to prefix/Lib.
@ -642,19 +642,12 @@ elif not pythonpath:
i = 0
while True:
try:
keyname = winreg.EnumKey(key, i)
subkey = winreg.OpenKeyEx(key, keyname)
if not subkey:
continue
try:
v = winreg.QueryValue(subkey)
finally:
winreg.CloseKey(subkey)
if isinstance(v, str):
pythonpath.append(v)
i += 1
v = winreg.QueryValue(key, winreg.EnumKey(key, i))
except OSError:
break
if isinstance(v, str):
pythonpath.append(v)
i += 1
finally:
winreg.CloseKey(key)
except OSError: