Visitar URL original
gh-78878: Fix crash when creating an instance of `_ctypes.CField` by shihai1991 · Pull Request #14837 · python/cpython · GitHub
Skip to content

gh-78878: Fix crash when creating an instance of _ctypes.CField #14837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 9 commits into from
Dec 21, 2022
Merged

gh-78878: Fix crash when creating an instance of _ctypes.CField #14837

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
846f291
Deleteing PyCField_new function
shihai1991 Jul 18, 2019
04fe037
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 18, 2019
88199f4
fix whitespace
shihai1991 Jul 18, 2019
fdad367
Merge branch 'bpo_34697' of github.com:shihai1991/cpython into bpo_34697
shihai1991 Jul 18, 2019
76eeee2
Merge main
shihai1991 Aug 4, 2022
2878571
Merge remote-tracking branch 'origin/main' into bpo_34697
shihai1991 Dec 18, 2022
b1709fd
resolve conflict
shihai1991 Dec 18, 2022
e1b3415
Update News
shihai1991 Dec 19, 2022
a53a570
update News
shihai1991 Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Deleteing PyCField_new function
  • Loading branch information
@shihai1991
shihai1991 committed Jul 18, 2019
commit 846f291940f5219febe16ae70650b4fb0a920fc6
6 changes: 6 additions & 0 deletions Lib/ctypes/test/test_struct_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ class Y(X):
Y._fields_ = []
self.assertRaises(AttributeError, setattr, X, "_fields_", [])

def test_5(self):
class X(Structure):
_fields_ = [("x", c_int)]
CField = type(X.x)
self.assertRaises(TypeError, CField)

# __set__ and __get__ should raise a TypeError in case their self
# argument is not a ctype instance.
def test___set__(self):
Expand Down
11 changes: 2 additions & 9 deletions Modules/_ctypes/cfield.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ static void pymem_destructor(PyObject *ptr)
/*
PyCField_Type
*/
static PyObject *
PyCField_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
CFieldObject *obj;
obj = (CFieldObject *)type->tp_alloc(type, 0);
return (PyObject *)obj;
}

/*
* Expects the size, index and offset for the current field in *psize and
Expand Down Expand Up @@ -60,7 +53,7 @@ PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
#define CONT_BITFIELD 2
#define EXPAND_BITFIELD 3

self = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
self = (CFieldObject *)PyCField_Type.tp_alloc((PyTypeObject *)&PyCField_Type, 0);
if (self == NULL)
return NULL;
dict = PyType_stgdict(desc);
Expand Down Expand Up @@ -336,7 +329,7 @@ PyTypeObject PyCField_Type = {
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
PyCField_new, /* tp_new */
0, /* tp_new */
0, /* tp_free */
};

Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/stgdict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ MakeFields(PyObject *type, CFieldObject *descr,
}
continue;
}
new_descr = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
new_descr = (CFieldObject *)PyCField_Type.tp_alloc((PyTypeObject *)&PyCField_Type, 0);
if (new_descr == NULL) {
Py_DECREF(fdescr);
Py_DECREF(fieldlist);
Expand Down