summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-10-06 17:50:02 (GMT)
committerMark Dickinson <mdickinson@enthought.com>2012-10-06 17:50:02 (GMT)
commitfc9adb62fbfa8d2f81f7224afea43557a4fff409 (patch)
treed777412bbee100729199ce2d30754a13c2e2ef35
parentc04ddff290fc203d05b75c8569b748525fb76b5b (diff)
downloadcpython-fc9adb62fbfa8d2f81f7224afea43557a4fff409.zip
cpython-fc9adb62fbfa8d2f81f7224afea43557a4fff409.tar.gz
cpython-fc9adb62fbfa8d2f81f7224afea43557a4fff409.tar.bz2
Issue #16096: Fix signed overflow in Objects/longobject.c. Thanks Serhiy Storchaka.
-rw-r--r--Objects/longobject.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 73413dd..4cc080f 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -668,10 +668,9 @@ _PyLong_NumBits(PyObject *vv)
assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0);
if (ndigits > 0) {
digit msd = v->ob_digit[ndigits - 1];
-
- result = (ndigits - 1) * PyLong_SHIFT;
- if (result / PyLong_SHIFT != (size_t)(ndigits - 1))
+ if ((size_t)(ndigits - 1) > PY_SIZE_MAX / (size_t)PyLong_SHIFT)
goto Overflow;
+ result = (size_t)(ndigits - 1) * (size_t)PyLong_SHIFT;
do {
++result;
if (result == 0)