Merge pull request numpy#25672 from ngoldbaum/fix-scalar-from-string-…

…overflow

numpy/_core/src/multiarray/arraytypes.c.src

@@ -359,7 +359,23 @@ NPY_NO_EXPORT int
     @type@ temp;  /* ensures alignment */
 
 #if @is_int@
-    if (PyLong_Check(op)) {
+    int is_pylong = PyLong_Check(op);
+    // array objects do not get checked for overflow after conversion to a
+    // pyint because the default fill value for integer masked arrays is
+    // array(999999), which overflows for (u)int8 and (u)int16.
+    if (!(is_pylong || PyArray_Check(op))) {
+        PyObject* ret = PyNumber_Long(op);
+        if (ret == NULL) {
+            return -1;
+        }
+        op = ret;
+        if (@TYPE@_safe_pyint_setitem(op, &temp) < 0) {
+            Py_DECREF(op);
+            return -1;
+        }
+        Py_DECREF(op);
+    }
+    else if (is_pylong) {
         /*
          * When weak promotion is enabled (using NEP 50) we also use more
          * strict parsing of integers:  All out-of-bound Python integer

numpy/_core/tests/test_nep50_promotions.py

@@ -309,3 +309,34 @@ def test_integer_integer_comparison(comp):
 
     # Test that the NumPy comparison ufuncs work with large Python integers
     assert comp(2**200, -2**200) == comp(2**200, -2**200, dtype=object)
+
+
+def create_with_scalar(sctype, value):
+    return sctype(value)
+
+
+def create_with_array(sctype, value):
+    return np.array([value], dtype=sctype)
+
+
+@pytest.mark.parametrize("sctype",
+        [np.int8, np.int16, np.int32, np.int64,
+         np.uint8, np.uint16, np.uint32, np.uint64])
+@pytest.mark.parametrize("create", [create_with_scalar, create_with_array])
+def test_oob_creation(sctype, create):
+    iinfo = np.iinfo(sctype)
+
+    with pytest.raises(OverflowError):
+        create(sctype, iinfo.min - 1)
+
+    with pytest.raises(OverflowError):
+        create(sctype, iinfo.max + 1)
+
+    with pytest.raises(OverflowError):
+        create(sctype, str(iinfo.min - 1))
+
+    with pytest.raises(OverflowError):
+        create(sctype, str(iinfo.max + 1))
+
+    assert create(sctype, iinfo.min) == iinfo.min
+    assert create(sctype, iinfo.max) == iinfo.max

numpy/f2py/tests/test_array_from_pyobj.py

@@ -549,6 +549,10 @@ def test_in_cache_from_2casttype_failure(self):
                 continue
             if t.elsize >= self.type.elsize:
                 continue
+            is_int = np.issubdtype(t.dtype, np.integer)
+            if is_int and int(self.num2seq[0]) > np.iinfo(t.dtype).max:
+                # skip test if num2seq would trigger an overflow error
+                continue
             obj = np.array(self.num2seq, dtype=t.dtype)
             shape = (len(self.num2seq), )
             try: