Skip to content

gh-111178: fix UBSan failures in Python/traceback.c #128259

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
encukou merged 5 commits into from
Jan 27, 2025
Merged

gh-111178: fix UBSan failures in Python/traceback.c #128259

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a410b26
fix UBSan failures for `PyTracebackObject`
picnixz Dec 25, 2024
3cbe2c0
cosmetic upgrades
picnixz Dec 25, 2024
ba62e8f
fix compilation
picnixz Dec 25, 2024
9653fdb
reduce diff
picnixz Jan 14, 2025
7395d40
Merge branch 'main' into fix/ubsan/traceback-111178
picnixz Jan 18, 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 compilation
  • Loading branch information
@picnixz
picnixz committed Dec 25, 2024
commit ba62e8fbd9a50d06b450301f106ad410aac85e9e
6 changes: 3 additions & 3 deletions Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ tb_dir(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(ignored))
static PyObject *
tb_next_get(PyObject *op, void *Py_UNUSED(_))
{
PyTracebackObject *self = _PyTracebackObject_CAST(op)
PyTracebackObject *self = _PyTracebackObject_CAST(op);
PyObject* ret = (PyObject*)self->tb_next;
if (!ret) {
ret = Py_None;
Expand All @@ -125,7 +125,7 @@ tb_lineno_get(PyObject *op, void *Py_UNUSED(_))
PyTracebackObject *self = _PyTracebackObject_CAST(op);
int lineno = self->tb_lineno;
if (lineno == -1) {
lineno = tb_get_lineno(self);
lineno = tb_get_lineno(op);
if (lineno < 0) {
Py_RETURN_NONE;
}
Expand Down Expand Up @@ -673,7 +673,7 @@ tb_printinternal(PyTracebackObject *tb, PyObject *f, long limit)
code = PyFrame_GetCode(tb->tb_frame);
int tb_lineno = tb->tb_lineno;
if (tb_lineno == -1) {
tb_lineno = tb_get_lineno(tb);
tb_lineno = tb_get_lineno((PyObject *)tb);
}
if (last_file == NULL ||
code->co_filename != last_file ||
Expand Down