8000 gh-111178: fix UBSan failures in `Modules/_datetimemodule.c` by picnixz · Pull Request #129774 · python/cpython · GitHub
[go: up one dir, main page]
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
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
use 'dummy' for NOARGS method
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit b189115328f2a133d152ccea35b54ba7b5082d64
42 changes: 21 additions & 21 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3256,7 +3256,7 @@ date_fromtimestamp(PyObject *cls, PyObject *obj)
* generally the same as calling C's time.
*/
static PyObject *
date_today(PyObject *cls, PyObject *dummy)
date_today(PyObject *cls, PyObject *Py_UNUSED(dummy))
{
PyObject *time;
PyObject *result;
Expand Down Expand Up @@ -3531,7 +3531,7 @@ date_repr(PyObject *op)
}

static PyObject *
date_isoformat(PyObject *op, PyObject *Py_UNUSED(ignored))
date_isoformat(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_Date *self = _PyDate_CAST(op);
return PyUnicode_FromFormat("%04d-%02d-%02d",
Expand All @@ -3547,7 +3547,7 @@ date_str(PyObject *self)


static PyObject *
date_ctime(PyObject *self, PyObject *Py_UNUSED(ignored))
date_ctime(PyObject *self, PyObject *Py_UNUSED(dummy))
{
return format_ctime(self, 0, 0, 0);
}
Expand Down Expand Up @@ -3593,7 +3593,7 @@ date_format(PyObject *self, PyObject *args)
/* ISO methods. */

static PyObject *
date_isoweekday(PyObject *self, PyObject *Py_UNUSED(ignored))
date_isoweekday(PyObject *self, PyObject *Py_UNUSED(dummy))
{
int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self));

Expand Down Expand Up @@ -3750,7 +3750,7 @@ iso_calendar_date_new_impl(PyTypeObject *type, int year, int week,
}

static PyObject *
date_isocalendar(PyObject *self, PyObject *Py_UNUSED(ignored))
date_isocalendar(PyObject *self, PyObject *Py_UNUSED(dummy))
{
int year = GET_YEAR(self);
int week1_monday = iso_week1_monday(year);
Expand Down Expand Up @@ -3805,7 +3805,7 @@ date_richcompare(PyObject *self, PyObject *other, int op)
}

static PyObject *
date_timetuple(PyObject *self, PyObject *Py_UNUSED(ignored))
date_timetuple(PyObject *self, PyObject *Py_UNUSED(dummy))
{
return build_struct_time(GET_YEAR(self),
GET_MONTH(self),
Expand Down Expand Up @@ -3853,14 +3853,14 @@ date_hash(PyObject *op)
}

static PyObject *
date_toordinal(PyObject *self, PyObject *Py_UNUSED(ignored))
date_toordinal(PyObject *self, PyObject *Py_UNUSED(dummy))
{
return PyLong_FromLong(ymd_to_ord(GET_YEAR(self), GET_MONTH(self),
GET_DAY(self)));
}

static PyObject *
date_weekday(PyObject *self, PyObject *Py_UNUSED(ignored))
date_weekday(PyObject *self, PyObject *Py_UNUSED(dummy))
{
int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self));
return PyLong_FromLong(dow);
Expand All @@ -3879,7 +3879,7 @@ date_getstate(PyDateTime_Date *self)
}

static PyObject *
date_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
date_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_Date *self = _PyDate_CAST(op);
return Py_BuildValue("(ON)", Py_TYPE(self), date_getstate(self));
Expand Down Expand Up @@ -4145,7 +4145,7 @@ tzinfo_fromutc(PyObject *self, PyObject *dt)
*/

static PyObject *
tzinfo_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
tzinfo_reduce(PyObject *self, PyObject *Py_UNUSED(dummy))
{
PyObject *args, *state;
PyObject *getinitargs;
Expand Down Expand Up @@ -4411,7 +4411,7 @@ timezone_fromutc(PyObject *op, PyObject *arg)
}

static PyObject *
timezone_getinitargs(PyObject *op, PyObject *Py_UNUSED(ignored))
timezone_getinitargs(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_TimeZone *self = _PyTimeZone_CAST(op);
if (self->name == NULL)
Expand Down Expand Up @@ -4697,19 +4697,19 @@ time_dealloc(PyObject *op)

/* These are all METH_NOARGS, so don't need to check the arglist. */
static PyObject *
time_utcoffset(PyObject *op, PyObject *Py_UNUSED(unused)) {
time_utcoffset(PyObject *op, PyObject *Py_UNUSED(dummy)) {
PyDateTime_Time *self = _PyTime_CAST(op);
return call_utcoffset(GET_TIME_TZINFO(self), Py_None);
}

static PyObject *
time_dst(PyObject *op, PyObject *Py_UNUSED(unused)) {
time_dst(PyObject *op, PyObject *Py_UNUSED(dummy)) {
PyDateTime_Time *self = _PyTime_CAST(op);
return call_dst(GET_TIME_TZINFO(self), Py_None);
}

static PyObject *
time_tzname(PyObject *op, PyObject *Py_UNUSED(unused)) {
time_tzname(PyObject *op, PyObject *Py_UNUSED(dummy)) {
PyDateTime_Time *self = _PyTime_CAST(op);
return call_tzname(GET_TIME_TZINFO(self), Py_None);
}
Expand Down Expand Up @@ -6275,7 +6275,7 @@ datetime_isoformat(PyObject *op, PyObject *args, PyObject *kw)
}

static PyObject *
datetime_ctime(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_ctime(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
return format_ctime(op,
Expand Down Expand Up @@ -6756,7 +6756,7 @@ datetime_astimezone(PyObject *op, PyObject *args, PyObject *kw)
}

static PyObject *
datetime_timetuple(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_timetuple(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
int dstflag = -1;
Expand Down Expand Up @@ -6832,7 +6832,7 @@ local_to_seconds(int year, int month, int day,
#define EPOCH_SECONDS (719163LL * 24 * 60 * 60)

static PyObject *
datetime_timestamp(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_timestamp(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
PyObject *result;
Expand Down Expand Up @@ -6867,7 +6867,7 @@ datetime_timestamp(PyObject *op, PyObject *Py_UNUSED(ignored))
}

static PyObject *
datetime_getdate(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_getdate(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
return new_date(GET_YEAR(self),
Expand All @@ -6876,7 +6876,7 @@ datetime_getdate(PyObject *op, PyObject *Py_UNUSED(ignored))
}

static PyObject *
datetime_gettime(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_gettime(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
return new_time(DATE_GET_HOUR(self),
Expand All @@ -6888,7 +6888,7 @@ datetime_gettime(PyObject *op, PyObject *Py_UNUSED(ignored))
}

static PyObject *
datetime_gettimetz(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_gettimetz(PyObject *op, PyObject *Py_UNUSED(dummy))
{
PyDateTime_DateTime *self = _PyDateTime_CAST(op);
return new_time(DATE_GET_HOUR(self),
Expand All @@ -6900,7 +6900,7 @@ datetime_gettimetz(PyObject *op, PyObject *Py_UNUSED(ignored))
}

static PyObject *
datetime_utctimetuple(PyObject *op, PyObject *Py_UNUSED(ignored))
datetime_utctimetuple(PyObject *op, PyObject *Py_UNUSED(dummy))
{
int y, m, d, hh, mm, ss;
PyObject *tzinfo;
Expand Down
0