[Python-checkins] [2.7] bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13906)
Stefan Krah
webhook-mailer at python.org
Sat Jun 8 05:19:37 EDT 2019
https://github.com/python/cpython/commit/48f190f79cd89f7ad4409b3c782e462368583309
commit: 48f190f79cd89f7ad4409b3c782e462368583309
branch: 2.7
author: Eric Wieser <wieser.eric at gmail.com>
committer: Stefan Krah <skrah at bytereef.org>
date: 2019-06-08T11:19:24+02:00
summary:
[2.7] bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13906)
files:
M Lib/ctypes/test/test_arrays.py
M Modules/_ctypes/_ctypes.c
diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py
index 29fd422a68cc..ec00d9f9f657 100644
--- 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
index d608100243d8..bef251ef049d 100644
--- 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);
More information about the Python-checkins
mailing list