summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2019-06-07 08:13:26 (GMT)
committerStefan Krah <skrah@bytereef.org>2019-06-07 08:13:26 (GMT)
commit0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54 (patch)
treec97f618f70df6cf7d9bba176f732995441858dd2
parent554450fb4e95066e825bdb4a2d544a490daeebdc (diff)
downloadcpython-0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54.zip
cpython-0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54.tar.gz
cpython-0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54.tar.bz2
bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13881)
-rw-r--r--Lib/ctypes/test/test_arrays.py15
-rw-r--r--Modules/_ctypes/_ctypes.c2
2 files changed, 16 insertions, 1 deletions
diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py
index 87ecbf0..a3e6d76 100644
--- a/Lib/ctypes/test/test_arrays.py
+++ b/Lib/ctypes/test/test_arrays.py
@@ -208,6 +208,21 @@ class ArrayTestCase(unittest.TestCase):
_type_ = c_int
_length_ = 0
+ def test_empty_element_struct(self):
+ class EmptyStruct(Structure):
+ _fields_ = []
+
+ obj = (EmptyStruct * 2)() # bpo37188: Floating point exception
+ assert sizeof(obj) == 0
+
+ def test_empty_element_array(self):
+ class EmptyArray(Array):
+ _type_ = c_int
+ _length_ = 0
+
+ obj = (EmptyArray * 2)() # bpo37188: Floating point exception
+ assert 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 f7513a3..2201c45 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1518,7 +1518,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");
goto error;