8000 gh-111178: fix UBSan failures in `Modules/_ctypes` by picnixz · Pull Request #129071 · python/cpython · GitHub
[go: up one dir, main page]
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
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
fix UBSan failures for CFieldObject
  • Loading branch information
@picnixz
picnixz committed Jan 20, 2025
commit e193e6f9e250bc6b6eb9aae61f5ce427ec4aa9cb
35 changes: 21 additions & 14 deletions Modules/_ctypes/cfield.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ static void pymem_destructor(PyObject *ptr)
/*
PyCField_Type
*/

#define _CFieldObject_CAST(op) ((CFieldObject *)(op))

/*[clinic input]
class _ctypes.CField "PyObject *" "PyObject"
[clinic start generated code]*/
Expand Down Expand Up @@ -194,31 +197,33 @@ PyCField_new_impl(PyTypeObject *type, PyObject *name, PyObject *proto,


static int
PyCField_set(CFieldObject *self, PyObject *inst, PyObject *value)
PyCField_set(PyObject *op, PyObject *inst, PyObject *value)
{
CDataObject *dst;
char *ptr;
CFieldObject *self = _CFieldObject_CAST(op);
ctypes_state *st = get_module_state_by_class(Py_TYPE(self));
if (!CDataObject_Check(st, inst)) {
PyErr_SetString(PyExc_TypeError,
"not a ctype instance");
return -1;
}
dst = (CDataObject *)inst;
dst = _CFieldObject_CAST(inst);
ptr = dst->b_ptr + self->offset;
if (value == NULL) {
PyErr_SetString(PyExc_TypeError,
"can't delete attribute");
return -1;
}
return PyCData_set(st, inst, self->proto, self->setfunc, value,
self->index, self->size, ptr);
self->index, self->size, ptr);
}

static PyObject *
PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type)
PyCField_get(PyObject *op, PyObject *inst, PyTypeObject *type)
{
CDataObject *src;
CFieldObject *self = _CFieldObject_CAST(op);
if (inst == NULL) {
return Py_NewRef(self);
}
Expand All @@ -228,21 +233,21 @@ PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type)
"not a ctype instance");
return NULL;
}
src = (CDataObject *)inst;
src = _CFieldObject_CAST(inst);
return PyCData_get(st, self->proto, self->getfunc, inst,
self->index, self->size, src->b_ptr + self->offset);
self->index, self->size, src->b_ptr + self->offset);
}

static PyObject *
PyCField_get_offset(PyObject *self, void *data)
{
return PyLong_FromSsize_t(((CFieldObject *)self)->offset);
return PyLong_FromSsize_t(_CFieldObject_CAST(self)->offset);
}

static PyObject *
PyCField_get_size(PyObject *self, void *data)
{
return PyLong_FromSsize_t(((CFieldObject *)self)->size);
return PyLong_FromSsize_t(_CFieldObject_CAST(self)->size);
}

static PyGetSetDef PyCField_getset[] = {
Expand All @@ -252,17 +257,20 @@ static PyGetSetDef PyCField_getset[] = {
};

static int
PyCField_traverse(CFieldObject *self, visitproc visit, void *arg)
PyCField_traverse(PyObject *op, visitproc visit, void *arg)
{
CFieldObject *self = _CFieldObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->proto);
return 0;
}

static int
PyCField_clear(CFieldObject *self)
PyCField_clear(PyObject *op)
{
CFieldObject *self = _CFieldObject_CAST(op);
Py_CLEAR(self->proto);
Py_CLEAR(self->name);
return 0;
}

Expand All @@ -271,17 +279,16 @@ PyCField_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
CFieldObject *self_cf = (CFieldObject *)self;
(void)PyCField_clear(self_cf);
Py_CLEAR(self_cf->name);
(void)PyCField_clear(self);
Py_TYPE(self)->tp_free(self);
Py_DECREF(tp);
}

static PyObject *
PyCField_repr(CFieldObject *self)
PyCField_repr(PyObject *op)
{
PyObject *result;
CFieldObject *self = _CFieldObject_CAST(op);
Py_ssize_t bits = NUM_BITS(self->size);
Py_ssize_t size = LOW_BIT(self->size);
const char *name;
Expand Down
0