https://github.com/python/cpython/commit/874eed6cfe165df6469bf806cd3f1eb08e432286
commit: 874eed6cfe165df6469bf806cd3f1eb08e432286
branch: 3.12
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-07-17T07:58:25Z
summary:
[3.12] gh-121153: Fix some errors with use of _PyLong_CompactValue() (GH-121154)
* The result has type Py_ssize_t, not intptr_t.
* Type cast between unsigned and signed integer types should be explicit.
* Downcasting should be explicit.
* Fix integer overflow check in sum().
(cherry picked from commit 1801545)
files:
M Objects/longobject.c
M Python/bltinmodule.c
diff --git a/Objects/longobject.c b/Objects/longobject.c
index c72e1643c9f41d..83699e065fb74a 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -484,11 +484,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);
@@ -633,14 +640,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)) {
@@ -686,7 +694,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,
@@ -723,7 +731,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);
@@ -1267,7 +1279,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,
@@ -1298,7 +1321,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);
@@ -1370,7 +1397,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);
@@ -3308,7 +3350,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;
}
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 84fbc33a48ca61..1a65ddd0154bd0 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2559,8 +2559,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);
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
