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

gh-111178: fix UBSan failures in Modules/_ope 8000 rator.c #129785

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

gh-111178: fix UBSan failures in Modules/_operator.c #129785

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c79e956
fix UBSan failures for `itemgetterobject`
picnixz Jan 25, 2025
09316c7
fix UBSan failures for `attrgetterobject`
picnixz Jan 25, 2025
19aff62
fix UBSan failures for `methodcallerobject`
picnixz Jan 25, 2025
c5b56f5
suppress unused return values
picnixz Jan 25, 2025
557f786
Merge remote-tracking branch 'upstream/main' into fix/ubsan/operator-…
picnixz Feb 7, 2025
a75ffb3
Use `dummy` parameter when for NOARGS method
picnixz Feb 7, 2025
88ff307
Do not add an underscore to the macro if none is needed.
picnixz Feb 8, 2025
3805e00
Merge branch 'main' into fix/ubsan/operator-111178
encukou 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
Do not add an underscore to the macro if none is needed.
  • Loading branch information
@picnixz
picnixz committed Feb 8, 2025
commit 88ff307ad0f126ea94e69abadd5f70151141d70f
42 changes: 21 additions & 21 deletions Modules/_operator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ typedef struct {
vectorcallfunc vectorcall;
} itemgetterobject;

#define _itemgetterobject_CAST(op) ((itemgetterobject *)(op))
#define itemgetterobject_CAST(op) ((itemgetterobject *)(op))

// Forward declarations
static PyObject *
Expand Down Expand Up @@ -1079,7 +1079,7 @@ itemgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int
itemgetter_clear(PyObject *op)
{
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);
Py_CLEAR(ig->item);
return 0;
}
Expand All @@ -1097,7 +1097,7 @@ itemgetter_dealloc(PyObject *op)
static int
itemgetter_traverse(PyObject *op, visitproc visit, void *arg)
{
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);
Py_VISIT(Py_TYPE(ig));
Py_VISIT(ig->item);
return 0;
Expand All @@ -1111,7 +1111,7 @@ itemgetter_call(PyObject *op, PyObject *args, PyObject *kw)
return NULL;
if (!_PyArg_CheckPositional("itemgetter", PyTuple_GET_SIZE(args), 1, 1))
return NULL;
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);
return itemgetter_call_impl(ig, PyTuple_GET_ITEM(args, 0));
}

Expand All @@ -1126,7 +1126,7 @@ itemgetter_vectorcall(PyObject *op, PyObject *const *args,
if (!_PyArg_CheckPositional("itemgetter", nargs, 1, 1)) {
return NULL;
}
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);
return itemgetter_call_impl(ig, args[0]);
}

Expand Down Expand Up @@ -1171,7 +1171,7 @@ itemgetter_repr(PyObject *op)
{
PyObject *repr;
const char *reprfmt;
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);

int status = Py_ReprEnter(op);
if (status != 0) {
Expand All @@ -1189,7 +1189,7 @@ itemgetter_repr(PyObject *op)
static PyObject *
itemgetter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
itemgetterobject *ig = _itemgetterobject_CAST(op);
itemgetterobject *ig = itemgetterobject_CAST(op);
if (ig->nitems == 1)
return Py_BuildValue("O(O)", Py_TYPE(ig), ig->item);
return PyTuple_Pack(2, Py_TYPE(ig), ig->item);
Expand Down Expand Up @@ -1247,7 +1247,7 @@ typedef struct {
vectorcallfunc vectorcall;
} attrgetterobject;

#define _attrgetterobject_CAST(op) ((attrgetterobject *)(op))
#define attrgetterobject_CAST(op) ((attrgetterobject *)(op))

// Forward declarations
static PyObject *
Expand Down Expand Up @@ -1367,7 +1367,7 @@ attrgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int
attrgetter_clear(PyObject *op)
{
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
Py_CLEAR(ag->attr);
return 0;
}
Expand All @@ -1385,7 +1385,7 @@ attrgetter_dealloc(PyObject *op)
static int
attrgetter_traverse(PyObject *op, visitproc visit, void *arg)
{
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
Py_VISIT(ag->attr);
Py_VISIT(Py_TYPE(ag));
return 0;
Expand Down Expand Up @@ -1431,7 +1431,7 @@ attrgetter_call(PyObject *op, PyObject *args, PyObject *kw)
return NULL;
if (!_PyArg_CheckPositional("attrgetter", PyTuple_GET_SIZE(args), 1, 1))
return NULL;
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
return attrgetter_call_impl(ag, PyTuple_GET_ITEM(args, 0));
}

Expand All @@ -1446,7 +1446,7 @@ attrgetter_vectorcall(PyObject *op, PyObject *const *args,
if (!_PyArg_CheckPositional("attrgetter", nargs, 1, 1)) {
return NULL;
}
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
return attrgetter_call_impl(ag, args[0]);
}

Expand Down Expand Up @@ -1523,7 +1523,7 @@ static PyObject *
attrgetter_repr(PyObject *op)
{
PyObject *repr = NULL;
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
int status = Py_ReprEnter(op);
if (status != 0) {
if (status < 0)
Expand Down Expand Up @@ -1555,7 +1555,7 @@ attrgetter_repr(PyObject *op)
static PyObject *
attrgetter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
attrgetterobject *ag = _attrgetterobject_CAST(op);
attrgetterobject *ag = attrgetterobject_CAST(op);
PyObject *attrstrings = attrgetter_args(ag);
if (attrstrings == NULL)
return NULL;
Expand Down Expand Up @@ -1618,15 +1618,15 @@ typedef struct {
vectorcallfunc vectorcall;
} methodcallerobject;

#define _methodcallerobject_CAST(op) ((methodcallerobject *)(op))
#define methodcallerobject_CAST(op) ((methodcallerobject *)(op))

#define _METHODCALLER_MAX_ARGS 8

static PyObject *
methodcaller_vectorcall(PyObject *op, PyObject *const *args,
size_t nargsf, PyObject* kwnames)
{
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);
if (!_PyArg_CheckPositional("methodcaller", PyVectorcall_NARGS(nargsf), 1, 1)
|| !_PyArg_NoKwnames("methodcaller", kwnames)) {
return NULL;
Expand Down Expand Up @@ -1741,7 +1741,7 @@ methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static void
methodcaller_clear(PyObject *op)
{
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);
Py_CLEAR(mc->name);
Py_CLEAR(mc->args);
Py_CLEAR(mc->kwds);
Expand All @@ -1762,7 +1762,7 @@ methodcaller_dealloc(PyObject *op)
static int
methodcaller_traverse(PyObject *op, visitproc visit, void *arg)
{
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);
Py_VISIT(mc->name);
Py_VISIT(mc->args);
Py_VISIT(mc->kwds);
Expand All @@ -1776,7 +1776,7 @@ static PyObject *
methodcaller_call(PyObject *op, PyObject *args, PyObject *kw)
{
PyObject *method, *obj, *result;
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);

if (!_PyArg_NoKeywords("methodcaller", kw))
return NULL;
Expand All @@ -1795,7 +1795,7 @@ methodcaller_call(PyObject *op, PyObject *args, PyObject *kw)
static PyObject *
methodcaller_repr(PyObject *op)
{
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);
PyObject *argreprs, *repr = NULL, *sep, *joinedargreprs;
Py_ssize_t numtotalargs, numposargs, numkwdargs, i;
int status = Py_ReprEnter(op);
Expand Down Expand Up @@ -1872,7 +1872,7 @@ methodcaller_repr(PyObject *op)
static PyObject *
methodcaller_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
methodcallerobject *mc = _methodcallerobject_CAST(op);
methodcallerobject *mc = methodcallerobject_CAST(op);
if (!mc->kwds || PyDict_GET_SIZE(mc->kwds) == 0) {
Py_ssize_t i;
Py_ssize_t callargcount = PyTuple_GET_SIZE(mc->args);
Expand Down
Loading
0