Skip to content

gh-111178: fix UBSan failures in Objects/typeobject.c #129799

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 7 commits into from
Feb 25, 2025
Merged

gh-111178: fix UBSan failures in Objects/typeobject.c #129799

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb45420
fix UBSan failures for `PyTypeObject`
picnixz Feb 6, 2025
8caec09
use a macro and remove redundant casts for `superobject` casts
picnixz Feb 6, 2025
d78434e
Merge remote-tracking branch 'upstream/main' into fix/ubsan/typeobjec…
picnixz Feb 7, 2025
3a661a3
address Victor's review
picnixz Feb 22, 2025
70dacc6
Merge branch 'main' into fix/ubsan/typeobject-111178
picnixz Feb 22, 2025
73ef441
reverting suggestion
picnixz Feb 22, 2025
3e710c3
Merge branch 'main' into fix/ubsan/typeobject-111178
picnixz Feb 25, 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
address Victor's review
  • Loading branch information
@picnixz
picnixz committed Feb 22, 2025
commit 3a661a38048bfac36c048520a810c8e252029acc
8 changes: 4 additions & 4 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ _PyType_Name(PyTypeObject *type)
return s;
}

static inline PyObject *
static PyObject *
type_name(PyObject *tp, void *Py_UNUSED(closure))
{
PyTypeObject *type = PyTypeObject_CAST(tp);
Expand All @@ -1344,7 +1344,7 @@ type_name(PyObject *tp, void *Py_UNUSED(closure))
}
}

static inline PyObject *
static PyObject *
type_qualname(PyObject *tp, void *Py_UNUSED(closure))
{
PyTypeObject *type = PyTypeObject_CAST(tp);
Expand Down Expand Up @@ -1466,7 +1466,7 @@ _PyType_GetFullyQualifiedName(PyTypeObject *type, char sep)
return PyUnicode_FromString(type->tp_name);
}

PyObject *qualname = type_qualname((PyObject *)type, NULL);
PyObject *qualname = Py_NewRef(((PyHeapTypeObject *)type)->ht_qualname);
Comment thread
picnixz marked this conversation as resolved.
Outdated
if (qualname == NULL) {
return NULL;
}
Expand Down Expand Up @@ -1498,7 +1498,7 @@ PyType_GetFullyQualifiedName(PyTypeObject *type)
return _PyType_GetFullyQualifiedName(type, '.');
}

static inline PyObject *
static PyObject *
type_abstractmethods(PyObject *tp, void *Py_UNUSED(closure))
{
PyTypeObject *type = PyTypeObject_CAST(tp);
Expand Down