Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-121153: Fix some errors with use of _PyLong_CompactValue() #121154

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 6 commits into from
Jul 13, 2024
Merged

gh-121153: Fix some errors with use of _PyLong_CompactValue() #121154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a6872f
gh-121153: Fix some errors with use of _PyLong_CompactValue()
serhiy-storchaka Jun 29, 2024
bfc0db1
Merge branch 'main' into _PyLong_CompactValue-type-cast
serhiy-storchaka Jun 29, 2024
576770f
Fix PyLong_AsUnsignedLong.
serhiy-storchaka Jun 29, 2024
9367d89
Merge remote-tracking branch 'refs/remotes/origin/_PyLong_CompactValu…
serhiy-storchaka Jun 29, 2024
940acfa
Fix PyLong_AsLongAndOverflow.
serhiy-storchaka Jun 29, 2024
e186e79
Fix also integer overflow check in sum().
serhiy-storchaka Jul 13, 2024
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
68 changes: 55 additions & 13 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,18 @@ PyLong_AsLongAndOverflow(PyObject *vv, int *overflow)
do_decref = 1;
}
if (_PyLong_IsCompact(v)) {
#if SIZEOF_LONG < SIZEOF_VOID_P
intptr_t tmp = _PyLong_CompactValue(v);
res = (long)tmp;
if (res != tmp) {
*overflow = tmp < 0 ? -1 : 1;
#if SIZEOF_LONG < SIZEOF_SIZE_T
Py_ssize_t tmp = _PyLong_CompactValue(v);
if (tmp < LONG_MIN) {
*overflow = -1;
res = -1;
}
else if (tmp > LONG_MAX) {
*overflow = 1;
res = -1;
}
else {
res = (long)tmp;
}
#else
res = _PyLong_CompactValue(v);
Expand Down Expand Up @@ -632,14 +639,15 @@ PyLong_AsUnsignedLong(PyObject *vv)

v = (PyLongObject *)vv;
if (_PyLong_IsNonNegativeCompact(v)) {
#if SIZEOF_LONG < SIZEOF_VOID_P
intptr_t tmp = _PyLong_CompactValue(v);
#if SIZEOF_LONG < SIZEOF_SIZE_T
size_t tmp = (size_t)_PyLong_CompactValue(v);
unsigned long res = (unsigned long)tmp;
if (res != tmp) {
goto overflow;
}
return res;
#else
return _PyLong_CompactValue(v);
return (unsigned long)(size_t)_PyLong_CompactValue(v);
#endif
}
if (_PyLong_IsNegative(v)) {
Expand Down Expand Up @@ -685,7 +693,7 @@ PyLong_AsSize_t(PyObject *vv)

v = (PyLongObject *)vv;
if (_PyLong_IsNonNegativeCompact(v)) {
return _PyLong_CompactValue(v);
return (size_t)_PyLong_CompactValue(v);
}
if (_PyLong_IsNegative(v)) {
PyErr_SetString(PyExc_OverflowError,
Expand Down Expand Up @@ -722,7 +730,11 @@ _PyLong_AsUnsignedLongMask(PyObject *vv)
}
v = (PyLongObject *)vv;
if (_PyLong_IsCompact(v)) {
return (unsigned long)_PyLong_CompactValue(v);
#if SIZEOF_LONG < SIZEOF_SIZE_T
return (unsigned long)(size_t)_PyLong_CompactValue(v);
#else
return (unsigned long)(long)_PyLong_CompactValue(v);
#endif
}
i = _PyLong_DigitCount(v);
int sign = _PyLong_NonCompactSign(v);
Expand Down Expand Up @@ -1540,7 +1552,18 @@ PyLong_AsUnsignedLongLong(PyObject *vv)
v = (PyLongObject*)vv;
if (_PyLong_IsNonNegativeCompact(v)) {
res = 0;
bytes = _PyLong_CompactValue(v);
#if SIZEOF_LONG_LONG < SIZEOF_SIZE_T
size_t tmp = (size_t)_PyLong_CompactValue(v);
bytes = (unsigned long long)tmp;
if (bytes != tmp) {
PyErr_SetString(PyExc_OverflowError,
"Python int too large to convert "
"to C unsigned long long");
res = -1;
}
#else
bytes = (unsigned long long)(size_t)_PyLong_CompactValue(v);
#endif
}
else {
res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes,
Expand Down Expand Up @@ -1571,7 +1594,11 @@ _PyLong_AsUnsignedLongLongMask(PyObject *vv)
}
v = (PyLongObject *)vv;
if (_PyLong_IsCompact(v)) {
return (unsigned long long)(signed long long)_PyLong_CompactValue(v);
#if SIZEOF_LONG_LONG < SIZEOF_SIZE_T
return (unsigned long long)(size_t)_PyLong_CompactValue(v);
#else
return (unsigned long long)(long long)_PyLong_CompactValue(v);
#endif
}
i = _PyLong_DigitCount(v);
sign = _PyLong_NonCompactSign(v);
Expand Down Expand Up @@ -1643,7 +1670,22 @@ PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow)
do_decref = 1;
}
if (_PyLong_IsCompact(v)) {
#if SIZEOF_LONG_LONG < SIZEOF_SIZE_T
Py_ssize_t tmp = _PyLong_CompactValue(v);
if (tmp < LLONG_MIN) {
*overflow = -1;
res = -1;
}
else if (tmp > LLONG_MAX) {
*overflow = 1;
res = -1;
}
else {
res = (long long)tmp;
}
#else
res = _PyLong_CompactValue(v);
#endif
}
else {
i = _PyLong_DigitCount(v);
Expand Down Expand Up @@ -3579,7 +3621,7 @@ long_hash(PyLongObject *v)
int sign;

if (_PyLong_IsCompact(v)) {
x = _PyLong_CompactValue(v);
x = (Py_uhash_t)_PyLong_CompactValue(v);
if (x == (Py_uhash_t)-1) {
x = (Py_uhash_t)-2;
}
Expand Down
4 changes: 2 additions & 2 deletions Python/bltinmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2601,8 +2601,8 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
b = PyLong_AsLongAndOverflow(item, &overflow);
}
if (overflow == 0 &&
(i_result >= 0 ? (b <= LONG_MAX - i_result)
: (b >= LONG_MIN - i_result)))
(i_result >= 0 ? (b <= PY_SSIZE_T_MAX - i_result)
: (b >= PY_SSIZE_T_MIN - i_result)))
{
i_result += b;
Py_DECREF(item);
Expand Down
Loading