https://github.com/python/cpython/commit/1ef6bf4e29db43bbf06639923516838db2d5a5ba
commit: 1ef6bf4e29db43bbf06639923516838db2d5a5ba
branch: main
author: Bénédikt Tran <[email protected]>
committer: encukou <[email protected]>
date: 2025-01-06T12:50:01+01:00
summary:
gh-111178: fix UBSan failures in `Objects/descrobject.c` (GH-128245)
fix UBSan failures for `propertyobject`
files:
M Objects/descrobject.c
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 4eccd1704eb95a..1852118359f014 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1508,6 +1508,8 @@ PyWrapper_New(PyObject *d, PyObject *self)
/* A built-in 'property' type */
+#define _propertyobject_CAST(op) ((propertyobject *)(op))
+
/*
class property(object):
@@ -1911,8 +1913,9 @@ property_init_impl(propertyobject *self, PyObject *fget,
PyObject *fset,
}
static PyObject *
-property_get__name__(propertyobject *prop, void *Py_UNUSED(ignored))
+property_get__name__(PyObject *op, void *Py_UNUSED(ignored))
{
+ propertyobject *prop = _propertyobject_CAST(op);
PyObject *name;
if (property_name(prop, &name) < 0) {
return NULL;
@@ -1925,16 +1928,17 @@ property_get__name__(propertyobject *prop, void
*Py_UNUSED(ignored))
}
static int
-property_set__name__(propertyobject *prop, PyObject *value,
- void *Py_UNUSED(ignored))
+property_set__name__(PyObject *op, PyObject *value, void *Py_UNUSED(ignored))
{
+ propertyobject *prop = _propertyobject_CAST(op);
Py_XSETREF(prop->prop_name, Py_XNewRef(value));
return 0;
}
static PyObject *
-property_get___isabstractmethod__(propertyobject *prop, void *closure)
+property_get___isabstractmethod__(PyObject *op, void *closure)
{
+ propertyobject *prop = _propertyobject_CAST(op);
int res = _PyObject_IsAbstract(prop->prop_get);
if (res == -1) {
return NULL;
@@ -1962,9 +1966,8 @@ property_get___isabstractmethod__(propertyobject *prop,
void *closure)
}
static PyGetSetDef property_getsetlist[] = {
- {"__name__", (getter)property_get__name__, (setter)property_set__name__},
- {"__isabstractmethod__",
- (getter)property_get___isabstractmethod__, NULL,
+ {"__name__", property_get__name__, property_set__name__, NULL, NULL},
+ {"__isabstractmethod__", property_get___isabstractmethod__, NULL,
NULL,
NULL},
{NULL} /* Sentinel */
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
