Commit 02dd539d authored by Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

Issue #12764: Fix a crash in ctypes when the name of a Structure field is not

a string.
parent 172f374a
......@@ -239,6 +239,14 @@ class StructureTestCase(unittest.TestCase):
pass
self.assertRaises(TypeError, setattr, POINT, "_fields_", [("x", 1), ("y", 2)])
def test_invalid_name(self):
# field name must be string
def declare_with_name(name):
class S(Structure):
_fields_ = [(name, c_int)]
self.assertRaises(TypeError, declare_with_name, b"x")
def test_intarray_fields(self):
class SomeInts(Structure):
_fields_ = [("a", c_int * 4)]
......
......@@ -193,6 +193,9 @@ Library
Extension Modules
-----------------
- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not
a string.
- Issue #11241: subclasses of ctypes.Array can now be subclassed.
- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
......
......@@ -482,8 +482,21 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
char *fieldfmt = dict->format ? dict->format : "B";
char *fieldname = _PyUnicode_AsString(name);
char *ptr;
Py_ssize_t len = strlen(fieldname) + strlen(fieldfmt);
char *buf = alloca(len + 2 + 1);
Py_ssize_t len;
char *buf;
if (fieldname == NULL)
{
PyErr_Format(PyExc_TypeError,
"structure field name must be string not %s",
name->ob_type->tp_name);
Py_DECREF(pair);
return -1;
}
len = strlen(fieldname) + strlen(fieldfmt);
buf = alloca(len + 2 + 1);
sprintf(buf, "%s:%s:", fieldfmt, fieldname);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment