Skip to content

bpo-35021: Fixes assertion failures in _datetimemodule.c #10040

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

Closed
serhiy-storchaka wants to merge 1 commit into from
Closed

bpo-35021: Fixes assertion failures in _datetimemodule.c #10040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,19 +893,38 @@ def test_issue31752(self):
class BadInt(int):
def __mul__(self, other):
return Prod()
def __rmul__(self, other):
return Prod()
def __floordiv__(self, other):
return Prod()
def __rfloordiv__(self, other):
return Prod()

class Prod:
def __add__(self, other):
return Sum()
def __radd__(self, other):
return Sum()

class Sum(int):
def __divmod__(self, other):
# negative remainder
return (0, -1)

timedelta(microseconds=BadInt(1))
timedelta(hours=BadInt(1))
timedelta(weeks=BadInt(1))
return divmodresult

for divmodresult in [None, (), (0, 1, 2), (0, -1)]:
with self.subTest(divmodresult=divmodresult):
# The following examples should not crash.
timedelta(microseconds=BadInt(1))
timedelta(hours=BadInt(1))
timedelta(weeks=BadInt(1))
try:
timedelta(1) * BadInt(1)
except (TypeError, ValueError):
pass
BadInt(1) * timedelta(1)
try:
timedelta(1) // BadInt(1)
except TypeError:
pass


#############################################################################
Expand Down
13 changes: 7 additions & 6 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,7 +1786,10 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
PyObject *num = NULL;
PyObject *result = NULL;

assert(PyLong_CheckExact(pyus));
pyus = PyNumber_Long(pyus);
if (pyus == NULL) {
goto Done;
}
tuple = PyNumber_Divmod(pyus, us_per_second);
if (tuple == NULL)
goto Done;
Expand Down Expand Up @@ -1849,6 +1852,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
result = new_delta_ex(d, s, us, 0, type);

Done:
Py_XDECREF(pyus);
Py_XDECREF(tuple);
Py_XDECREF(num);
return result;
Expand All @@ -1868,7 +1872,7 @@ multiply_int_timedelta(PyObject *intobj, PyDateTime_Delta *delta)
if (pyus_in == NULL)
return NULL;

pyus_out = PyNumber_Multiply(pyus_in, intobj);
pyus_out = PyNumber_Multiply(intobj, pyus_in);
Comment thread
serhiy-storchaka marked this conversation as resolved.
Py_DECREF(pyus_in);
if (pyus_out == NULL)
return NULL;
Expand Down Expand Up @@ -2309,13 +2313,11 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
assert(num != NULL);

if (PyLong_Check(num)) {
prod = PyNumber_Multiply(factor, num);
prod = PyNumber_Multiply(num, factor);
if (prod == NULL)
return NULL;
assert(PyLong_CheckExact(prod));
sum = PyNumber_Add(sofar, prod);
Py_DECREF(prod);
assert(sum == NULL || PyLong_CheckExact(sum));
return sum;
}

Expand Down Expand Up @@ -2373,7 +2375,6 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
Py_DECREF(sum);
Py_DECREF(x);
*leftover += fracpart;
assert(y == NULL || PyLong_CheckExact(y));
return y;
}

Expand Down