Ensure that it works for signed wchar_t.

serhiy-storchaka · serhiy-storchaka · commit 349c3b2a7245 · 2025-09-03T10:32:45.000+03:00
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -501,7 +501,7 @@ _locale_strxfrm_impl(PyObject *module, PyObject *str)
          */
         size_t n3 = 0;
         for (size_t i = 0; i < n2; i++) {
-            if (buf[i] > 0x10000) {
+            if ((Py_UCS4)buf[i] > 0x10000u) {
                 n3++;
             }
         }
@@ -514,10 +514,10 @@ _locale_strxfrm_impl(PyObject *module, PyObject *str)
             }
             size_t j = 0;
             for (size_t i = 0; i < n2; i++) {
-                wchar_t c = buf[i];
-                if (c > 0x10000) {
-                    buf2[j++] = (((Py_UCS4)c) >> 16) | 0x10000u;
-                    buf2[j++] = ((Py_UCS4)c) & 0xffffu;
+                Py_UCS4 c = (Py_UCS4)buf[i];
+                if (c > 0x10000u) {
+                    buf2[j++] = (c >> 16) | 0x10000u;
+                    buf2[j++] = c & 0xFFFFu;
                 }
                 else {
                     buf2[j++] = c;

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ _locale_strxfrm_impl(PyObject module, PyObject str)`
`501`	`501`	`*/`
`502`	`502`	`size_t n3 = 0;`
`503`	`503`	`for (size_t i = 0; i < n2; i++) {`
`504`		`- if (buf[i] > 0x10000) {`
	`504`	`+ if ((Py_UCS4)buf[i] > 0x10000u) {`
`505`	`505`	`n3++;`
`506`	`506`	`}`
`507`	`507`	`}`
`@@ -514,10 +514,10 @@ _locale_strxfrm_impl(PyObject module, PyObject str)`
`514`	`514`	`}`
`515`	`515`	`size_t j = 0;`
`516`	`516`	`for (size_t i = 0; i < n2; i++) {`
`517`		`- wchar_t c = buf[i];`
`518`		`- if (c > 0x10000) {`
`519`		`- buf2[j++] = (((Py_UCS4)c) >> 16) \| 0x10000u;`
`520`		`- buf2[j++] = ((Py_UCS4)c) & 0xffffu;`
	`517`	`+ Py_UCS4 c = (Py_UCS4)buf[i];`
	`518`	`+ if (c > 0x10000u) {`
	`519`	`+ buf2[j++] = (c >> 16) \| 0x10000u;`
	`520`	`+ buf2[j++] = c & 0xFFFFu;`
`521`	`521`	`}`
`522`	`522`	`else {`
`523`	`523`	`buf2[j++] = c;`