[2.7] bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13906)

eric-wieser · Stefan Krah · commit 48f190f79cd8 · 2019-06-08T11:19:24.000+02:00
diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py
@@ -134,6 +134,21 @@ class my_int(c_int):
         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.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,7 @@ PyCArrayType_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`1534`	`1534`	`}`
`1535`	`1535`
`1536`	`1536`	`itemsize = itemdict->size;`
`1537`		`- if (length > PY_SSIZE_T_MAX / itemsize) {`
	`1537`	`+ if (itemsize != 0 && length > PY_SSIZE_T_MAX / itemsize) {`
`1538`	`1538`	`PyErr_SetString(PyExc_OverflowError,`
`1539`	`1539`	`"array too large");`
`1540`	`1540`	`Py_DECREF(stgdict);`