Skip to content

gh-95359: Fix py.exe launcher handling of per-user py.ini and command names #95399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2022
Merged

gh-95359: Fix py.exe launcher handling of per-user py.ini and command names #95399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/test/test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

TEST_PY_COMMANDS = "\n".join([
"[defaults]",
*[f"{k.lower()}={v}" for k, v in TEST_PY_ENV.items()]
*[f"{k[3:].lower()}={v}" for k, v in TEST_PY_ENV.items()]
])


Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :ref:`launcher` handling of :file:`py.ini` commands (it was incorrectly
expecting a ``py_`` prefix on keys) and crashes when reading per-user
configuration file.
18 changes: 11 additions & 7 deletions PC/launcher2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ _readIni(const wchar_t *section, const wchar_t *settingName, wchar_t *buffer, in
n = GetPrivateProfileStringW(section, settingName, NULL, buffer, bufferLength, iniPath);
if (n) {
debug(L"# Found %s in %s\n", settingName, iniPath);
return true;
return n;
} else if (GetLastError() == ERROR_FILE_NOT_FOUND) {
debug(L"# Did not find file %s\n", iniPath);
} else {
Expand Down Expand Up @@ -946,25 +946,29 @@ checkDefaults(SearchInfo *search)

// If tag is only a major version number, expand it from the environment
// or an ini file
const wchar_t *settingName = NULL;
const wchar_t *iniSettingName = NULL;
const wchar_t *envSettingName = NULL;
if (!search->tag || !search->tagLength) {
settingName = L"py_python";
iniSettingName = L"python";
envSettingName = L"py_python";
} else if (0 == wcsncmp(search->tag, L"3", search->tagLength)) {
settingName = L"py_python3";
iniSettingName = L"python3";
envSettingName = L"py_python3";
} else if (0 == wcsncmp(search->tag, L"2", search->tagLength)) {
settingName = L"py_python2";
iniSettingName = L"python2";
envSettingName = L"py_python2";
} else {
debug(L"# Cannot select defaults for tag '%.*s'\n", search->tagLength, search->tag);
return 0;
}

// First, try to read an environment variable
wchar_t buffer[MAXLEN];
int n = GetEnvironmentVariableW(settingName, buffer, MAXLEN);
int n = GetEnvironmentVariableW(envSettingName, buffer, MAXLEN);

// If none found, check in our two .ini files instead
if (!n) {
n = _readIni(L"defaults", settingName, buffer, MAXLEN);
n = _readIni(L"defaults", iniSettingName, buffer, MAXLEN);
}

if (n) {
Expand Down