Skip to content

bpo-45375: Fix assertion failure due to searching for stdlib in unnormalised paths #28735

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
zooba merged 3 commits into from
Oct 5, 2021
Merged

bpo-45375: Fix assertion failure due to searching for stdlib in unnormalised paths #28735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f482aa3
bpo-45375: Fix assertion failure due to searching for stdlib in unnor…
zooba Oct 5, 2021
e3d3672
Ensure freshly-built Python is run correctly
zooba Oct 5, 2021
468eda7
Fix path calculation
zooba Oct 5, 2021
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: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2021-10-05-12-41-53.bpo-45375.CohPP-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes an assertion failure due to searching for the standard library in
unnormalised paths.
24 changes: 23 additions & 1 deletion PC/getpathp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,21 @@ canonicalize(wchar_t *buffer, const wchar_t *path)
return _PyStatus_NO_MEMORY();
}

if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) {
if (PathIsRelativeW(path)) {
wchar_t buff[MAXPATHLEN];
Copy link
Contributor

@eryksun eryksun Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allocation should be MAXPATHLEN + 1. In this file, MAXPATHLEN refers to the string length of the path, without the terminating null.

if (!GetCurrentDirectoryW(MAXPATHLEN, buff)) {
return _PyStatus_ERR("unable to find current working directory");
}
if (FAILED(PathCchCombineEx(buff, MAXPATHLEN + 1, buff, path, PATHCCH_ALLOW_LONG_PATHS))) {
return INIT_ERR_BUFFER_OVERFLOW();
}
if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, buff, PATHCCH_ALLOW_LONG_PATHS))) {
return INIT_ERR_BUFFER_OVERFLOW();
}
return _PyStatus_OK();
}

if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, PATHCCH_ALLOW_LONG_PATHS))) {
return INIT_ERR_BUFFER_OVERFLOW();
}
return _PyStatus_OK();
Expand All @@ -291,6 +305,9 @@ search_for_prefix(wchar_t *prefix, const wchar_t *argv0_path)
/* Search from argv0_path, until LANDMARK is found.
We guarantee 'prefix' is null terminated in bounds. */
wcscpy_s(prefix, MAXPATHLEN+1, argv0_path);
if (!prefix[0]) {
return 0;
}
wchar_t stdlibdir[MAXPATHLEN+1];
wcscpy_s(stdlibdir, Py_ARRAY_LENGTH(stdlibdir), prefix);
/* We initialize with the longest possible path, in case it doesn't fit.
Expand Down Expand Up @@ -925,6 +942,7 @@ calculate_module_search_path(PyCalculatePath *calculate,
the parent of that.
*/
if (prefix[0] == L'\0') {
PyStatus status;
wchar_t lookBuf[MAXPATHLEN+1];
const wchar_t *look = buf - 1; /* 'buf' is at the end of the buffer */
while (1) {
Expand All @@ -939,6 +957,10 @@ calculate_module_search_path(PyCalculatePath *calculate,
nchars = lookEnd-look;
wcsncpy(lookBuf, look+1, nchars);
lookBuf[nchars] = L'\0';
status = canonicalize(lookBuf, lookBuf);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
/* Up one level to the parent */
reduce(lookBuf);
if (search_for_prefix(prefix, lookBuf)) {
Expand Down
4 changes: 3 additions & 1 deletion PCbuild/regen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
Condition="($(Platform) == 'Win32' or $(Platform) == 'x64') and
$(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'">
<Message Text="Regenerate @(_TestFrozenOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" />
<Exec Command="$(PythonExe) Programs\freeze_test_frozenmain.py Programs/test_frozenmain.h"
<Exec Command='setlocal
set PYTHONPATH=$(PySourcePath)Lib
"$(PythonExe)" Programs\freeze_test_frozenmain.py Programs\test_frozenmain.h'
WorkingDirectory="$(PySourcePath)" />
</Target>

Expand Down