Skip to content

gh-130567: Remove optimistic allocation in locale.strxfrm() #137143

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 3 commits into from
Oct 16, 2025
Merged

gh-130567: Remove optimistic allocation in locale.strxfrm() #137143

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f5515
Remove optimistic allocation in locale.strxfrm()
serhiy-storchaka Jul 27, 2025
fbf6e8e
Remove outdated comment.
serhiy-storchaka Jul 27, 2025
074be0f
Merge branch 'main' into locale-wcsxfrm
serhiy-storchaka Oct 15, 2025
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
32 changes: 10 additions & 22 deletions Modules/_localemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,36 +455,24 @@ _locale_strxfrm_impl(PyObject *module, PyObject *str)
goto exit;
}

/* assume no change in size, first */
n1 = n1 + 1;
/* Yet another +1 is needed to work around a platform bug in wcsxfrm()
* on macOS. See gh-130567. */
buf = PyMem_New(wchar_t, n1+1);
errno = 0;
n2 = wcsxfrm(NULL, s, 0);
if (errno && errno != ERANGE) {
PyErr_SetFromErrno(PyExc_OSError);
goto exit;
}
buf = PyMem_New(wchar_t, n2+1);
if (!buf) {
PyErr_NoMemory();
goto exit;
}

errno = 0;
n2 = wcsxfrm(buf, s, n1);
if (errno && errno != ERANGE) {
n2 = wcsxfrm(buf, s, n2+1);
if (errno) {
PyErr_SetFromErrno(PyExc_OSError);
goto exit;
}
if (n2 >= (size_t)n1) {
/* more space needed */
wchar_t * new_buf = PyMem_Realloc(buf, (n2+1)*sizeof(wchar_t));
if (!new_buf) {
PyErr_NoMemory();
goto exit;
}
buf = new_buf;
errno = 0;
n2 = wcsxfrm(buf, s, n2+1);
if (errno) {
PyErr_SetFromErrno(PyExc_OSError);
goto exit;
}
}
/* The result is just a sequence of integers, they are not necessary
Unicode code points, so PyUnicode_FromWideChar() cannot be used
here. For example, 0xD83D 0xDC0D should not be larger than 0xFF41.
Expand Down
Loading