mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 11:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-29843: raise AttributeError if given negative _length_ (GH-10029)

Browse Source 
Raise ValueError OverflowError in case of a negative
_length_ in a ctypes.Array subclass.  Also raise TypeError
instead of AttributeError for non-integer _length_.


Co-authored-by: Oren Milman <orenmn@gmail.com>
This commit is contained in:
Tal Einat 2018-10-22 18:33:10 +03:00 committed by GitHub
parent 121eb1694c
commit 2447773573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Lib/ctypes/test/test_arrays.py
View File

@ -163,8 +163,6 @@ class ArrayTestCase(unittest.TestCase):
self.assertEqual(Y()._length_, 187)
def test_bad_subclass(self):
import sys
with self.assertRaises(AttributeError):
class T(Array):
pass
@ -174,14 +172,30 @@ class ArrayTestCase(unittest.TestCase):
with self.assertRaises(AttributeError):
class T(Array):
_length_ = 13
def test_bad_length(self):
with self.assertRaises(ValueError):
class T(Array):
_type_ = c_int
_length_ = - sys.maxsize * 2
with self.assertRaises(ValueError):
class T(Array):
_type_ = c_int
_length_ = -1
with self.assertRaises(TypeError):
class T(Array):
_type_ = c_int
_length_ = 1.87
with self.assertRaises(OverflowError):
class T(Array):
_type_ = c_int
_length_ = sys.maxsize * 2
with self.assertRaises(AttributeError):
class T(Array):
_type_ = c_int
_length_ = 1.87
def test_zero_length(self):
# _length_ can be zero.
class T(Array):
_type_ = c_int
_length_ = 0
@unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
@bigmemtest(size=_2G, memuse=1, dry_run=False)

4
Misc/NEWS.d/next/Core and Builtins/2018-10-21-17-43-48.bpo-29743.aeCcKR.rst Normal file
View File

@ -0,0 +1,4 @@
Raise :exc:`ValueError` instead of :exc:`OverflowError` in case of a negative
``_length_`` in a :class:`ctypes.Array` subclass. Also raise :exc:`TypeError`
instead of :exc:`AttributeError` for non-integer ``_length_``.
Original patch by Oren Milman.

25
Modules/_ctypes/_ctypes.c
View File

@ -1405,13 +1405,28 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
type_attr = NULL;
length_attr = PyObject_GetAttrString((PyObject *)result, "_length_");
if (!length_attr || !PyLong_Check(length_attr)) {
PyErr_SetString(PyExc_AttributeError,
"class must define a '_length_' attribute, "
"which must be a positive integer");
Py_XDECREF(length_attr);
if (!length_attr) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_SetString(PyExc_AttributeError,
"class must define a '_length_' attribute");
}
goto error;
}
if (!PyLong_Check(length_attr)) {
Py_DECREF(length_attr);
PyErr_SetString(PyExc_TypeError,
"The '_length_' attribute must be an integer");
goto error;
}
if (_PyLong_Sign(length_attr) == -1) {
Py_DECREF(length_attr);
PyErr_SetString(PyExc_ValueError,
"The '_length_' attribute must not be negative");
goto error;
}
length = PyLong_AsSsize_t(length_attr);
Py_DECREF(length_attr);
if (length == -1 && PyErr_Occurred()) {