summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorOren Milman <orenmn@gmail.com>2017-09-17 10:45:38 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-09-17 10:45:38 (GMT)
commit30b61b51e05d2d43e8e2e783b0a9df738535423b (patch)
tree22ec0ba4927cde5bf880a95acc33829e446408f1 /Modules
parenta6bb313c70f8619e6dc4af5cef7d73fa3bbd59ca (diff)
downloadcpython-30b61b51e05d2d43e8e2e783b0a9df738535423b.zip
cpython-30b61b51e05d2d43e8e2e783b0a9df738535423b.tar.gz
cpython-30b61b51e05d2d43e8e2e783b0a9df738535423b.tar.bz2
bpo-31490: Fix an assertion failure in ctypes in case an _anonymous_ attr is defined only outside _fields_. (#3615)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ctypes/stgdict.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 3496c57..b66c6ec 100644
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -302,7 +302,15 @@ MakeAnonFields(PyObject *type)
Py_DECREF(anon_names);
return -1;
}
- assert(Py_TYPE(descr) == &PyCField_Type);
+ if (Py_TYPE(descr) != &PyCField_Type) {
+ PyErr_Format(PyExc_AttributeError,
+ "'%U' is specified in _anonymous_ but not in "
+ "_fields_",
+ fname);
+ Py_DECREF(anon_names);
+ Py_DECREF(descr);
+ return -1;
+ }
descr->anonymous = 1;
/* descr is in the field descriptor. */