https://github.com/python/cpython/commit/702c4a247360b43348a95c6fc76eb932483c33b1
commit: 702c4a247360b43348a95c6fc76eb932483c33b1
branch: main
author: Bénédikt Tran <[email protected]>
committer: encukou <[email protected]>
date: 2024-09-27T23:51:50+02:00
summary:
gh-111178: fix some USAN failures - mismatched function pointers (GH-123004)
files:
M Objects/exceptions.c
M Objects/rangeobject.c
M Objects/tupleobject.c
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index fda62f159c1540..b3910855165494 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -3387,8 +3387,9 @@ _PyErr_NoMemory(PyThreadState *tstate)
}
static void
-MemoryError_dealloc(PyBaseExceptionObject *self)
+MemoryError_dealloc(PyObject *obj)
{
+ PyBaseExceptionObject *self = (PyBaseExceptionObject *)obj;
_PyObject_GC_UNTRACK(self);
BaseException_clear(self);
@@ -3447,7 +3448,7 @@ PyTypeObject _PyExc_MemoryError = {
PyVarObject_HEAD_INIT(NULL, 0)
"MemoryError",
sizeof(PyBaseExceptionObject),
- 0, (destructor)MemoryError_dealloc, 0, 0, 0, 0, 0, 0, 0,
+ 0, MemoryError_dealloc, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
PyDoc_STR("Out of memory."), (traverseproc)BaseException_traverse,
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 1318ce0319d438..2942ab624edf72 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -143,14 +143,14 @@ range_new(PyTypeObject *type, PyObject *args, PyObject
*kw)
static PyObject *
-range_vectorcall(PyTypeObject *type, PyObject *const *args,
+range_vectorcall(PyObject *rangetype, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
if (!_PyArg_NoKwnames("range", kwnames)) {
return NULL;
}
- return range_from_array(type, args, nargs);
+ return range_from_array((PyTypeObject *)rangetype, args, nargs);
}
PyDoc_STRVAR(range_doc,
@@ -803,7 +803,7 @@ PyTypeObject PyRange_Type = {
0, /* tp_init */
0, /* tp_alloc */
range_new, /* tp_new */
- .tp_vectorcall = (vectorcallfunc)range_vectorcall
+ .tp_vectorcall = range_vectorcall
};
/*********************** range Iterator **************************/
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index f14f10ab9c0a46..4d8cca68df946a 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -999,8 +999,9 @@ tupleiter_traverse(_PyTupleIterObject *it, visitproc visit,
void *arg)
}
static PyObject *
-tupleiter_next(_PyTupleIterObject *it)
+tupleiter_next(PyObject *obj)
{
+ _PyTupleIterObject *it = (_PyTupleIterObject *)obj;
PyTupleObject *seq;
PyObject *item;
@@ -1101,7 +1102,7 @@ PyTypeObject PyTupleIter_Type = {
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
- (iternextfunc)tupleiter_next, /* tp_iternext */
+ tupleiter_next, /* tp_iternext */
tupleiter_methods, /* tp_methods */
0,
};
_______________________________________________
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]
