mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 11:45:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-31619: Fixed integer overflow in converting huge strings to int. (GH-3884) (#4690)

Browse source 
(cherry picked from commit 29ba688034)
This commit is contained in:
Miss Islington (bot) 2017-12-03 13:27:21 -08:00 • committed by Serhiy Storchaka
parent c8f32aae0a
commit 30a6bc8429
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/longobject.c
View file

@ -2016,7 +2016,7 @@ long_from_binary_base(const char **str, int base, PyLongObject **res)
const char *p = *str;
const char *start = p;
char prev = 0;
int digits = 0;
Py_ssize_t digits = 0;
int bits_per_char;
Py_ssize_t n;
PyLongObject *z;
@ -2259,8 +2259,9 @@ just 1 digit at the start, so that the copying code was exercised for every
digit beyond the first.
***/
twodigits c; /* current input character */
double fsize_z;
Py_ssize_t size_z;
int digits = 0;
Py_ssize_t digits = 0;
int i;
int convwidth;
twodigits convmultmax, convmult;
@ -2322,7 +2323,14 @@ digit beyond the first.
* need to initialize z->ob_digit -- no slot is read up before
* being stored into.
*/
size_z = (Py_ssize_t)(digits * log_base_BASE[base]) + 1;
fsize_z = digits * log_base_BASE[base] + 1;
if (fsize_z > MAX_LONG_DIGITS) {
/* The same exception as in _PyLong_New(). */
PyErr_SetString(PyExc_OverflowError,
"too many digits in integer");
return NULL;
}
size_z = (Py_ssize_t)fsize_z;
/* Uncomment next line to test exceedingly rare copy code */
/* size_z = 1; */
assert(size_z > 0);