requested size_t change

Author: tom-pytel

Modules/arraymodule.c

@@ -152,10 +152,9 @@ enum machine_format_code {
 #define array_Check(op, state) PyObject_TypeCheck(op, state->ArrayType)
 
 static inline bool
-arraydata_size_valid(Py_ssize_t size, int itemsize)
+arraydata_size_valid(size_t size, int itemsize)
 {
-    return size >= 0 &&
-        size <= (PY_SSIZE_T_MAX - (Py_ssize_t)sizeof(arraydata)) / itemsize;
+    return size <= (size_t)((PY_SSIZE_T_MAX - (Py_ssize_t)sizeof(arraydata)) / itemsize);
 }
 
 static arraydata *
@@ -269,11 +268,6 @@ array_resize(arrayobject *self, Py_ssize_t newsize)
      */
 
     size_t _new_size = (newsize >> 4) + (Py_SIZE(self) < 8 ? 3 : 7) + newsize;
-    // Limit over-allocation to not overflow Py_ssize_t, newsize can't ever be
-    // larger than this anyway.
-    if (_new_size > PY_SSIZE_T_MAX) {
-        _new_size = PY_SSIZE_T_MAX;
-    }
     int itemsize = self->ob_descr->itemsize;
 
     if (!arraydata_size_valid(_new_size, itemsize)) {
@@ -2123,7 +2117,6 @@ array_array_fromunicode_impl(arrayobject *self, PyObject *ustr)
         if (ustr_length > 1) {
             ustr_length--; /* trim trailing NUL character */
             Py_ssize_t old_size = Py_SIZE(self);
-            // if overflows PY_SSIZE_T_MAX arraydata_size_valid() will catch it
             Py_ssize_t new_size = old_size + ustr_length;
 
             if (!arraydata_size_valid(new_size, sizeof(wchar_t))) {
@@ -2141,7 +2134,6 @@ array_array_fromunicode_impl(arrayobject *self, PyObject *ustr)
     else { // typecode == 'w'
         Py_ssize_t ustr_length = PyUnicode_GetLength(ustr);
         Py_ssize_t old_size = Py_SIZE(self);
-        // if overflows PY_SSIZE_T_MAX arraydata_size_valid() will catch it
         Py_ssize_t new_size = old_size + ustr_length;
 
         if (!arraydata_size_valid(new_size, sizeof(Py_UCS4))) {