traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-31619: Fixed a ValueError when convert a string with large number of underscores (#3827) 

to integer with binary base.
This commit is contained in:
Serhiy Storchaka 2017-10-03 14:13:44 +03:00 committed by GitHub
parent 1a87de7fcf
commit 85c0b8941f
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_int.py
View File

@ -508,5 +508,13 @@ class IntTestCases(unittest.TestCase):
check('123\ud800') check('123\ud800')
check('123\ud800', 10) check('123\ud800', 10)
def test_issue31619(self):
self.assertEqual(int('1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1_0_1', 2),
0b1010101010101010101010101010101)
self.assertEqual(int('1_2_3_4_5_6_7_0_1_2_3', 8), 0o12345670123)
self.assertEqual(int('1_2_3_4_5_6_7_8_9', 16), 0x123456789)
self.assertEqual(int('1_2_3_4_5_6_7', 32), 1144132807)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()

2
Misc/NEWS.d/next/Core and Builtins/2017-09-29-20-32-24.bpo-31619.6gQ1kv.rst Normal file
View File

@ -0,0 +1,2 @@
Fixed a ValueError when convert a string with large number of underscores
to integer with binary base.

8
Objects/longobject.c
View File

@ -2057,15 +2057,15 @@ long_from_binary_base(const char **str, int base, PyLongObject **res)
} }
*str = p; *str = p;
/* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */ /* n <- the number of Python digits needed,
n = digits * bits_per_char + PyLong_SHIFT - 1; = ceiling((digits * bits_per_char) / PyLong_SHIFT). */
if (n / bits_per_char < p - start) { if (digits > (PY_SSIZE_T_MAX - (PyLong_SHIFT - 1)) / bits_per_char) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"int string too large to convert"); "int string too large to convert");
*res = NULL; *res = NULL;
return 0; return 0;
} }
n = n / PyLong_SHIFT; n = (digits * bits_per_char + PyLong_SHIFT - 1) / PyLong_SHIFT;
z = _PyLong_New(n); z = _PyLong_New(n);
if (z == NULL) { if (z == NULL) {
*res = NULL; *res = NULL;