Merge pull request #29415 from charris/backport-29369

charris · web-flow · commit bc51076cb8fe · 2025-07-22T11:01:57.000-06:00
BUG: fix casting issue in center, ljust, rjust, and zfill (#29369)
diff --git a/numpy/_core/src/umath/stringdtype_ufuncs.cpp b/numpy/_core/src/umath/stringdtype_ufuncs.cpp
@@ -1736,7 +1736,7 @@ center_ljust_rjust_strided_loop(PyArrayMethod_Context *context,
             size_t num_codepoints = inbuf.num_codepoints();
             npy_intp width = (npy_intp)*(npy_int64*)in2;
 
-            if (num_codepoints > (size_t)width) {
+            if ((npy_intp)num_codepoints > width) {
                 width = num_codepoints;
             }
 
@@ -1866,8 +1866,8 @@ zfill_strided_loop(PyArrayMethod_Context *context,
         {
             Buffer<ENCODING::UTF8> inbuf((char *)is.buf, is.size);
             size_t in_codepoints = inbuf.num_codepoints();
-            size_t width = (size_t)*(npy_int64 *)in2;
-            if (in_codepoints > width) {
+            npy_intp width = (npy_intp)*(npy_int64*)in2;
+            if ((npy_intp)in_codepoints > width) {
                 width = in_codepoints;
             }
             // number of leading one-byte characters plus the size of the
diff --git a/numpy/_core/tests/test_strings.py b/numpy/_core/tests/test_strings.py
@@ -846,6 +846,7 @@ def test_rjust_raises_multiple_character_fill(self, dt):
         ('abc', 6, ' ', ' abc  '),
         ('abc', 3, ' ', 'abc'),
         ('abc', 2, ' ', 'abc'),
+        ('abc', -2, ' ', 'abc'),
         ('abc', 10, '*', '***abc****'),
     ])
     def test_center(self, buf, width, fillchar, res, dt):
@@ -859,6 +860,7 @@ def test_center(self, buf, width, fillchar, res, dt):
         ('abc', 6, ' ', 'abc   '),
         ('abc', 3, ' ', 'abc'),
         ('abc', 2, ' ', 'abc'),
+        ('abc', -2, ' ', 'abc'),
         ('abc', 10, '*', 'abc*******'),
     ])
     def test_ljust(self, buf, width, fillchar, res, dt):
@@ -872,6 +874,7 @@ def test_ljust(self, buf, width, fillchar, res, dt):
         ('abc', 6, ' ', '   abc'),
         ('abc', 3, ' ', 'abc'),
         ('abc', 2, ' ', 'abc'),
+        ('abc', -2, ' ', 'abc'),
         ('abc', 10, '*', '*******abc'),
     ])
     def test_rjust(self, buf, width, fillchar, res, dt):
@@ -893,6 +896,7 @@ def test_rjust(self, buf, width, fillchar, res, dt):
         ('-0123', 5, '-0123'),
         ('000', 3, '000'),
         ('34', 1, '34'),
+        ('34', -1, '34'),
         ('0034', 4, '0034'),
     ])
     def test_zfill(self, buf, width, res, dt):

Original file line number	Diff line number	Diff line change
`@@ -1736,7 +1736,7 @@ center_ljust_rjust_strided_loop(PyArrayMethod_Context *context,`
`1736`	`1736`	`size_t num_codepoints = inbuf.num_codepoints();`
`1737`	`1737`	`npy_intp width = (npy_intp)(npy_int64)in2;`
`1738`	`1738`
`1739`		`- if (num_codepoints > (size_t)width) {`
	`1739`	`+ if ((npy_intp)num_codepoints > width) {`
`1740`	`1740`	`width = num_codepoints;`
`1741`	`1741`	`}`
`1742`	`1742`
`@@ -1866,8 +1866,8 @@ zfill_strided_loop(PyArrayMethod_Context *context,`
`1866`	`1866`	`{`
`1867`	`1867`	`Buffer<ENCODING::UTF8> inbuf((char *)is.buf, is.size);`
`1868`	`1868`	`size_t in_codepoints = inbuf.num_codepoints();`
`1869`		`- size_t width = (size_t)(npy_int64 )in2;`
`1870`		`- if (in_codepoints > width) {`
	`1869`	`+ npy_intp width = (npy_intp)(npy_int64)in2;`
	`1870`	`+ if ((npy_intp)in_codepoints > width) {`
`1871`	`1871`	`width = in_codepoints;`
`1872`	`1872`	`}`
`1873`	`1873`	`// number of leading one-byte characters plus the size of the`