Skip to content

gh-111178: fix UBSan failures in Modules/_datetimemodule.c #129774

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

gh-111178: fix UBSan failures in Modules/_datetimemodule.c #129774

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d4be207
add cast macros for date and time objects
picnixz Jan 26, 2025
6d1f263
fix UBSan failures for `PyDateTime_Delta`
picnixz Jan 26, 2025
1aeeff8
fix UBSan failures for `PyDateTime_Date`
picnixz Jan 26, 2025
9fee212
fix UBSan failures for `PyDateTime_TZInfo`
picnixz Jan 26, 2025
76d2c68
fix UBSan failures for `PyDateTime_TimeZone`
picnixz Jan 26, 2025
25dbe38
fix UBSan failures for `PyDateTime_Time`
picnixz Jan 26, 2025
0a3cb0e
fix UBSan failures for `PyDateTime_DateTime`
picnixz Jan 26, 2025
19bc7e1
fix UBSan failures for `PyDateTime_IsoCalendarDate`
picnixz Jan 26, 2025
b189115
use 'dummy' for NOARGS method
picnixz Feb 6, 2025
3c883a6
use 'dummy' for NOARGS method
picnixz Feb 6, 2025
86af79a
Merge remote-tracking branch 'upstream/main' into fix/ubsan/datetime-…
picnixz Feb 7, 2025
22bdf8c
Fixup naming
picnixz Feb 7, 2025
b6ee734
Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
9296eb6
Merge branch 'fix/ubsan/datetime-111178' of github.com:picnixz/cpytho…
picnixz Feb 8, 2025
f108a14
Merge in the main branch to resolve conflict with #127345
encukou Feb 19, 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 UBSan failures for PyDateTime_IsoCalendarDate
  • Loading branch information
@picnixz
picnixz committed Jan 26, 2025
commit 19bc7e1420c44378876837f50c8490ff3d1b4458
39 changes: 19 additions & 20 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,17 +3611,17 @@ typedef struct {
} PyDateTime_IsoCalendarDate;

static PyObject *
iso_calendar_date_repr(PyDateTime_IsoCalendarDate *self)
iso_calendar_date_repr(PyObject *self)
{
PyObject* year = PyTuple_GetItem((PyObject *)self, 0);
PyObject *year = PyTuple_GetItem(self, 0);
if (year == NULL) {
return NULL;
}
PyObject* week = PyTuple_GetItem((PyObject *)self, 1);
PyObject *week = PyTuple_GetItem(self, 1);
if (week == NULL) {
return NULL;
}
PyObject* weekday = PyTuple_GetItem((PyObject *)self, 2);
PyObject *weekday = PyTuple_GetItem(self, 2);
if (weekday == NULL) {
return NULL;
}
Expand All @@ -3634,7 +3634,7 @@ static PyObject *
iso_calendar_date_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
{
// Construct the tuple that this reduces to
PyObject * reduce_tuple = Py_BuildValue(
PyObject *reduce_tuple = Py_BuildValue(
"O((OOO))", &PyTuple_Type,
PyTuple_GET_ITEM(self, 0),
PyTuple_GET_ITEM(self, 1),
Expand All @@ -3645,61 +3645,60 @@ iso_calendar_date_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
}

static PyObject *
iso_calendar_date_year(PyDateTime_IsoCalendarDate *self, void *unused)
iso_calendar_date_year(PyObject *self, void *unused)
{
PyObject *year = PyTuple_GetItem((PyObject *)self, 0);
PyObject *year = PyTuple_GetItem(self, 0);
if (year == NULL) {
return NULL;
}
return Py_NewRef(year);
}

static PyObject *
iso_calendar_date_week(PyDateTime_IsoCalendarDate *self, void *unused)
iso_calendar_date_week(PyObject *self, void *unused)
{
PyObject *week = PyTuple_GetItem((PyObject *)self, 1);
PyObject *week = PyTuple_GetItem(self, 1);
if (week == NULL) {
return NULL;
}
return Py_NewRef(week);
}

static PyObject *
iso_calendar_date_weekday(PyDateTime_IsoCalendarDate *self, void *unused)
iso_calendar_date_weekday(PyObject *self, void *unused)
{
PyObject *weekday = PyTuple_GetItem((PyObject *)self, 2);
PyObject *weekday = PyTuple_GetItem(self, 2);
if (weekday == NULL) {
return NULL;
}
return Py_NewRef(weekday);
}

static PyGetSetDef iso_calendar_date_getset[] = {
{"year", (getter)iso_calendar_date_year},
{"week", (getter)iso_calendar_date_week},
{"weekday", (getter)iso_calendar_date_weekday},
{"year", iso_calendar_date_year},
{"week", iso_calendar_date_week},
{"weekday", iso_calendar_date_weekday},
{NULL}
};

static PyMethodDef iso_calendar_date_methods[] = {
{"__reduce__", (PyCFunction)iso_calendar_date_reduce, METH_NOARGS,
{"__reduce__", iso_calendar_date_reduce, METH_NOARGS,
PyDoc_STR("__reduce__() -> (cls, state)")},
{NULL, NULL},
};

static int
iso_calendar_date_traverse(PyDateTime_IsoCalendarDate *self, visitproc visit,
void *arg)
iso_calendar_date_traverse(PyObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
return PyTuple_Type.tp_traverse((PyObject *)self, visit, arg);
return PyTuple_Type.tp_traverse(self, visit, arg);
}

static void
iso_calendar_date_dealloc(PyDateTime_IsoCalendarDate *self)
iso_calendar_date_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyTuple_Type.tp_dealloc((PyObject *)self); // delegate GC-untrack as well
PyTuple_Type.tp_dealloc(self); // delegate GC-untrack as well
Py_DECREF(tp);
}

Expand Down