[Python-checkins] bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13881)
Stefan Krah
webhook-mailer at python.org
Fri Jun 7 04:13:58 EDT 2019
https://github.com/python/cpython/commit/0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54
commit: 0690c79c419b8d2bdfe7c5b6dca57b018f5a5a54
branch: master
author: Eric Wieser <wieser.eric at gmail.com>
committer: Stefan Krah <skrah at bytereef.org>
date: 2019-06-07T10:13:26+02:00
summary:
bpo-37188: Fix a divide-by-zero in arrays of size-0 objects (#13881)
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 87ecbf04e7ed..a3e6d76940e0 100644
--- a/Lib/ctypes/test/test_arrays.py
+++ b/Lib/ctypes/test/test_arrays.py
@@ -208,6 +208,21 @@ class T(Array):
_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 f7513a3d74c4..2201c4520ad0 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;
More information about the Python-checkins
mailing list