Skip to content

gh-111178: fix UBSan failures in Modules/_collectionsmodule.c #129773

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

gh-111178: fix UBSan failures in Modules/_collectionsmodule.c #129773

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22e4df8
fix UBSan failures for `dequeobject`
picnixz Jan 25, 2025
a19302d
fix UBSan failures for `dequeiterobject`
picnixz Jan 25, 2025
7a6384e
fix UBSan failures for `defdictobject`
picnixz Jan 25, 2025
6268c5e
fix UBSan failures for `tuplegetterobject`
picnixz Jan 25, 2025
337cb29
suppress unused return values
picnixz Jan 25, 2025
cd3775b
use 'dummy' for NOARGS method
picnixz Feb 6, 2025
e825058
Merge remote-tracking branch 'upstream/main' into fix/ubsan/collectio…
picnixz Feb 7, 2025
46da2c4
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
b245b68
Remove unnecessary cast
picnixz Feb 8, 2025
ef6141a
Merge branch 'main' into fix/ubsan/collections-111178
picnixz Feb 17, 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
use 'dummy' for NOARGS method
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit cd3775b258bbc049b5cfcad75eaac1da0ccedb46
10 changes: 5 additions & 5 deletions Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ dequeiter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}

static PyObject *
dequeiter_len(PyObject *op, PyObject *Py_UNUSED(args))
dequeiter_len(PyObject *op, PyObject *Py_UNUSED(dummy))
{
dequeiterobject *it = _dequeiterobject_CAST(op);
Py_ssize_t len = FT_ATOMIC_LOAD_SSIZE(it->counter);
Expand All @@ -2037,7 +2037,7 @@ dequeiter_len(PyObject *op, PyObject *Py_UNUSED(args))
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");

static PyObject *
dequeiter_reduce(PyObject *op, PyObject *Py_UNUSED(args))
dequeiter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
dequeiterobject *it = _dequeiterobject_CAST(op);
PyTypeObject *ty = Py_TYPE(it);
Expand Down Expand Up @@ -2250,7 +2250,7 @@ new_defdict(PyObject *op, PyObject *arg)
PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D.");

static PyObject *
defdict_copy(PyObject *op, PyObject *Py_UNUSED(args))
defdict_copy(PyObject *op, PyObject *Py_UNUSED(dummy))
{
/* This calls the object's class. That only works for subclasses
whose class constructor has the same signature. Subclasses that
Expand All @@ -2260,7 +2260,7 @@ defdict_copy(PyObject *op, PyObject *Py_UNUSED(args))
}

static PyObject *
defdict_reduce(PyObject *op, PyObject *Py_UNUSED(args))
defdict_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
/* __reduce__ must return a 5-tuple as follows:

Expand Down Expand Up @@ -2730,7 +2730,7 @@ tuplegetter_dealloc(PyObject *self)
}

static PyObject*
tuplegetter_reduce(PyObject *op, PyObject *Py_UNUSED(args))
tuplegetter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
_tuplegetterobject *self = _tuplegetterobject_CAST(op);
return Py_BuildValue("(O(nO))", (PyObject *)Py_TYPE(self),
Expand Down