greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-86179: Avoid making case-only changes when calculating realpath() during initialization (GH-113077)

Browse Source
This commit is contained in:
Steve Dower
2023-12-14 15:16:39 +00:00
committed by GitHub
parent 6873555955
commit fd81afc624
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/getpath.c
View File

@@ -506,12 +506,17 @@ done:
HANDLE hFile; HANDLE hFile;
wchar_t resolved[MAXPATHLEN+1]; wchar_t resolved[MAXPATHLEN+1];
int len = 0, err; int len = 0, err;
Py_ssize_t pathlen;
PyObject *result; PyObject *result;
wchar_t *path = PyUnicode_AsWideCharString(pathobj, NULL); wchar_t *path = PyUnicode_AsWideCharString(pathobj, &pathlen);
if (!path) { if (!path) {
return NULL; return NULL;
} }
if (wcslen(path) != pathlen) {
PyErr_SetString(PyExc_ValueError, "path contains embedded nulls");
return NULL;
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
hFile = CreateFileW(path, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); hFile = CreateFileW(path, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
@@ -535,7 +540,11 @@ done:
len -= 4; len -= 4;
} }
} }
result = PyUnicode_FromWideChar(p, len); if (CompareStringOrdinal(path, (int)pathlen, p, len, TRUE) == CSTR_EQUAL) {
result = Py_NewRef(pathobj);
} else {
result = PyUnicode_FromWideChar(p, len);
}
} else { } else {
result = Py_NewRef(pathobj); result = Py_NewRef(pathobj);
} }