Skip to content

gh-111178: fix UBSan failures in Modules/_ctypes #129071

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
picnixz merged 13 commits into from
Jan 21, 2025
Merged

gh-111178: fix UBSan failures in Modules/_ctypes #129071

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9c87ae1
fix UBSan failures for `DictRemoverObject`
picnixz Jan 20, 2025
ec730ba
fix UBSan failures for `StructParamObject`
picnixz Jan 20, 2025
a604eb7
fix UBSan failures for `CDataObject`
picnixz Jan 20, 2025
0014d3d
fix UBSan failures for `PyCFuncPtrObject`
picnixz Jan 20, 2025
5830275
fix UBSan failures for `PyCArgObject`
picnixz Jan 20, 2025
e193e6f
fix UBSan failures for `CFieldObject`
picnixz Jan 20, 2025
df5d477
remove redundant docstring casts
picnixz Jan 20, 2025
753ba2a
remove redundant PyObject casts
picnixz Jan 20, 2025
441a0be
fix compilation errors
picnixz Jan 20, 2025
5358251
consistency & warnings patches
picnixz Jan 20, 2025
a1f7e5a
reduce diff even further
picnixz Jan 20, 2025
504eabf
keep necessary cast
picnixz Jan 20, 2025
1e51fa7
add some new lines
picnixz Jan 20, 2025
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
Prev Previous commit
Next Next commit
remove redundant PyObject casts
  • Loading branch information
@picnixz
picnixz committed Jan 20, 2025
commit 753ba2afdc3b1d4c57e9941d94a003af267c89be
10 changes: 5 additions & 5 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ StructUnionType_init(PyObject *self, PyObject *args, PyObject *kwds, int isStruc

info->paramfunc = StructUnionType_paramfunc;

if (PyDict_GetItemRef((PyObject *)attrdict, &_Py_ID(_fields_), &fields) < 0) {
if (PyDict_GetItemRef(attrdict, &_Py_ID(_fields_), &fields) < 0) {
Py_DECREF(attrdict);
return -1;
}
Expand Down Expand Up @@ -2649,7 +2649,7 @@ make_funcptrtype_dict(ctypes_state *st, PyObject *attrdict, StgInfo *stginfo)
stginfo->getfunc = NULL;
stginfo->ffi_type_pointer = ffi_type_pointer;

if (PyDict_GetItemRef((PyObject *)attrdict, &_Py_ID(_flags_), &ob) < 0) {
if (PyDict_GetItemRef(attrdict, &_Py_ID(_flags_), &ob) < 0) {
return -1;
}
if (!ob || !PyLong_Check(ob)) {
Expand All @@ -2662,7 +2662,7 @@ make_funcptrtype_dict(ctypes_state *st, PyObject *attrdict, StgInfo *stginfo)
Py_DECREF(ob);

/* _argtypes_ is optional... */
if (PyDict_GetItemRef((PyObject *)attrdict, &_Py_ID(_argtypes_), &ob) < 0) {
if (PyDict_GetItemRef(attrdict, &_Py_ID(_argtypes_), &ob) < 0) {
return -1;
}
if (ob) {
Expand All @@ -2675,7 +2675,7 @@ make_funcptrtype_dict(ctypes_state *st, PyObject *attrdict, StgInfo *stginfo)
stginfo->converters = converters;
}

if (PyDict_GetItemRef((PyObject *)attrdict, &_Py_ID(_restype_), &ob) < 0) {
if (PyDict_GetItemRef(attrdict, &_Py_ID(_restype_), &ob) < 0) {
return -1;
}
if (ob) {
Expand All @@ -2697,7 +2697,7 @@ make_funcptrtype_dict(ctypes_state *st, PyObject *attrdict, StgInfo *stginfo)
}
}
/* XXX later, maybe.
if (PyDict_GetItemRef((PyObject *)attrdict, &_Py _ID(_errcheck_), &ob) < 0) {
if (PyDict_GetItemRef(attrdict, &_Py _ID(_errcheck_), &ob) < 0) {
return -1;
}
if (ob) {
Expand Down