[2.7] bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13906)
This commit is contained in:
parent
2bfc2dc214
commit
48f190f79c
|
@ -134,6 +134,21 @@ class ArrayTestCase(unittest.TestCase):
|
|||
t2 = my_int * 1
|
||||
self.assertIs(t1, t2)
|
||||
|
||||
def test_empty_element_struct(self):
|
||||
class EmptyStruct(Structure):
|
||||
_fields_ = []
|
||||
|
||||
obj = (EmptyStruct * 2)() # bpo37188: Floating point exception
|
||||
self.assertEqual(sizeof(obj), 0)
|
||||
|
||||
def test_empty_element_array(self):
|
||||
class EmptyArray(Array):
|
||||
_type_ = c_int
|
||||
_length_ = 0
|
||||
|
||||
obj = (EmptyArray * 2)() # bpo37188: Floating point exception
|
||||
self.assertEqual(sizeof(obj), 0)
|
||||
|
||||
def test_bpo36504_signed_int_overflow(self):
|
||||
# The overflow check in PyCArrayType_new() could cause signed integer
|
||||
# overflow.
|
||||
|
|
|
@ -1534,7 +1534,7 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|||
}
|
||||
|
||||
itemsize = itemdict->size;
|
||||
if (length > PY_SSIZE_T_MAX / itemsize) {
|
||||
if (itemsize != 0 && length > PY_SSIZE_T_MAX / itemsize) {
|
||||
PyErr_SetString(PyExc_OverflowError,
|
||||
"array too large");
|
||||
Py_DECREF(stgdict);
|
||||
|
|
Loading…
Reference in New Issue