Skip to content
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

bpo-37170: Fix the cast on error in PyLong_AsUnsignedLongLongMask() #13860

Merged
merged 3 commits into from
Jun 6, 2019
Merged

bpo-37170: Fix the cast on error in PyLong_AsUnsignedLongLongMask() #13860

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a69750
bpo-37170: Fix the cast on error in PyLong_AsUnsignedLongLongMask()
ZackerySpytz Jun 6, 2019
b3215b8
Make the requested changes.
ZackerySpytz Jun 6, 2019
e3feba1
Add a test.
ZackerySpytz Jun 6, 2019
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
6 changes: 4 additions & 2 deletions Doc/c-api/long.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
If the value of *obj* is out of range for an :c:type:`unsigned long`,
return the reduction of that value modulo ``ULONG_MAX + 1``.

Returns ``-1`` on error. Use :c:func:`PyErr_Occurred` to disambiguate.
Returns ``(unsigned long)-1`` on error. Use :c:func:`PyErr_Occurred` to
disambiguate.

.. versionchanged:: 3.8
Use :meth:`__index__` if available.
Expand All @@ -307,7 +308,8 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
If the value of *obj* is out of range for an :c:type:`unsigned long long`,
return the reduction of that value modulo ``PY_ULLONG_MAX + 1``.

Returns ``-1`` on error. Use :c:func:`PyErr_Occurred` to disambiguate.
Returns ``(unsigned long long)-1`` on error. Use :c:func:`PyErr_Occurred`
to disambiguate.

.. versionchanged:: 3.8
Use :meth:`__index__` if available.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C API/2019-06-06-08-47-04.bpo-37170.hO_fpM.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the cast on error in :c:func:`PyLong_AsUnsignedLongLongMask()`.
4 changes: 2 additions & 2 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ _PyLong_AsUnsignedLongLongMask(PyObject *vv)

if (vv == NULL || !PyLong_Check(vv)) {
PyErr_BadInternalCall();
return (unsigned long) -1;
return (unsigned long long) -1;
}
v = (PyLongObject *)vv;
switch(Py_SIZE(v)) {
Expand Down Expand Up @@ -1404,7 +1404,7 @@ PyLong_AsUnsignedLongLongMask(PyObject *op)

if (op == NULL) {
PyErr_BadInternalCall();
return (unsigned long)-1;
return (unsigned long long)-1;
}

if (PyLong_Check(op)) {
Expand Down