diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:07:29 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:07:29 (GMT) |
| commit | 04b35753f7a6bcf50f4a3676aca54cc961b93c83 (patch) | |
| tree | 6763a6dba12b8c9555d2120d749f4c1d39075e0c /Modules | |
| parent | e45df0a6dada198123264acc513ce471d681751d (diff) | |
| parent | 6e723d2d11c9a154c301a231788981a9b087aec5 (diff) | |
| download | cpython-04b35753f7a6bcf50f4a3676aca54cc961b93c83.zip cpython-04b35753f7a6bcf50f4a3676aca54cc961b93c83.tar.gz cpython-04b35753f7a6bcf50f4a3676aca54cc961b93c83.tar.bz2 | |
Issue #25659: Merge ctypes fix from 3.5
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/_ctypes.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 4807e4f..df3aede 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -463,7 +463,10 @@ CDataType_from_buffer(PyObject *type, PyObject *args) Py_ssize_t offset = 0; StgDictObject *dict = PyType_stgdict(type); - assert (dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, "abstract class"); + return NULL; + } if (!PyArg_ParseTuple(args, "O|n:from_buffer", &obj, &offset)) return NULL; @@ -531,9 +534,12 @@ CDataType_from_buffer_copy(PyObject *type, PyObject *args) Py_ssize_t offset = 0; PyObject *result; StgDictObject *dict = PyType_stgdict(type); - assert (dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, "abstract class"); + return NULL; + } - if (!PyArg_ParseTuple(args, "y*|n:from_buffer", &buffer, &offset)) + if (!PyArg_ParseTuple(args, "y*|n:from_buffer_copy", &buffer, &offset)) return NULL; if (offset < 0) { |