8000 gh-111178: fix UBSan failures in `Objects/frameobject.c` by picnixz · Pull Request #129777 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-111178: fix UBSan failures in Objects/frameobject.c #129777

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

gh-111178: fix UBSan failures in Objects/frameobject.c #129777

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d07bb3
fix UBSan failures for `PyFrameObject`
picnixz Feb 6, 2025
e23688a
fix UBSan failures for `PyFrameLocalsProxyObject`
picnixz Feb 6, 2025
85b229a
do not use ws alignments (the diff would anyway be unreadable)
picnixz Feb 6, 2025
34f3bd4
remove redundant cast
picnixz Feb 6, 2025
08e39f2
restore whitespace
picnixz Feb 6, 2025
1a9e43b
collapse whitespaces for frame objects
picnixz Feb 6, 2025
d280b5a
Merge remote-tracking branch 'upstream/main' into fix/ubsan/frameobje…
picnixz Feb 7, 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
do not use ws alignments (the diff would anyway be unreadable)
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 85b229ae15589e599cc3759f615b7ef4b21e2c5a
40 changes: 17 additions & 23 deletions Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,29 +803,23 @@ static PyMappingMethods framelocalsproxy_as_mapping = {
};

static PyMethodDef framelocalsproxy_methods[] = {
{"__contains__", framelocalsproxy___contains__, METH_O | METH_COEXIST,
NULL},
{"__getitem__", framelocalsproxy_getitem, METH_O | METH_COEXIST,
NULL},
{"update", framelocalsproxy_update, METH_O,
NULL},
{"__reversed__", framelocalsproxy_reversed, METH_NOARGS,
NULL},
{"copy", framelocalsproxy_copy, METH_NOARGS,
NULL},
{"keys", framelocalsproxy_keys, METH_NOARGS,
NULL},
{"values", framelocalsproxy_values, METH_NOARGS,
NULL},
{"items", _PyCFunction_CAST(framelocalsproxy_items), METH_NOARGS,
NULL},
{"get", _PyCFunction_CAST(framelocalsproxy_get), METH_FASTCALL,
NULL},
{"pop", _PyCFunction_CAST(framelocalsproxy_pop), METH_FASTCALL,
NULL},
{"setdefault", _PyCFunction_CAST(framelocalsproxy_setdefault), METH_FASTCALL,
NULL},
{NULL, NULL} /* sentinel */
{"__contains__", framelocalsproxy___contains__, METH_O | METH_COEXIST, NULL},
{"__getitem__", framelocalsproxy_getitem, METH_O | METH_COEXIST, NULL},
{"update", framelocalsproxy_update, METH_O, NULL},
{"__reversed__", framelocalsproxy_reversed, METH_NOARGS, NULL},
{"copy", framelocalsproxy_copy, METH_NOARGS, NULL},
{"keys", framelocalsproxy_keys, METH_NOARGS, NULL},
{"values", framelocalsproxy_values, METH_NOARGS, NULL},
{"items", _PyCFunction_CAST(framelocalsproxy_items), METH_NOARGS, NULL},
{"get", _PyCFunction_CAST(framelocalsproxy_get), METH_FASTCALL, NULL},
{"pop", _PyCFunction_CAST(framelocalsproxy_pop), METH_FASTCALL, NULL},
{
"setdefault",
_PyCFunction_CAST(framelocalsproxy_setdefault),
METH_FASTCALL,
NULL
},
{NULL, NULL} /* sentinel */
};

PyTypeObject PyFrameLocalsProxy_Type = {
Expand Down
0