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

[2.7] bpo-31579: Fixed a possible leak in enumerate() with large indices. (GH-3753). (#3761) 

(cherry picked from commit 0e950dd22b)
This commit is contained in:
Serhiy Storchaka 2017-09-26 09:11:27 +03:00 committed by GitHub
parent d94a65a069
commit 19eb87d857
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Objects/enumobject.c
View File

@ -87,19 +87,25 @@ enum_next_long(enumobject *en, PyObject* next_item)
if (en->en_longindex == NULL) { if (en->en_longindex == NULL) {
en->en_longindex = PyInt_FromSsize_t(PY_SSIZE_T_MAX); en->en_longindex = PyInt_FromSsize_t(PY_SSIZE_T_MAX);
if (en->en_longindex == NULL) if (en->en_longindex == NULL) {
Py_DECREF(next_item);
return NULL; return NULL;
} }
}
if (one == NULL) { if (one == NULL) {
one = PyInt_FromLong(1); one = PyInt_FromLong(1);
if (one == NULL) if (one == NULL) {
Py_DECREF(next_item);
return NULL; return NULL;
} }
}
next_index = en->en_longindex; next_index = en->en_longindex;
assert(next_index != NULL); assert(next_index != NULL);
stepped_up = PyNumber_Add(next_index, one); stepped_up = PyNumber_Add(next_index, one);
if (stepped_up == NULL) if (stepped_up == NULL) {
Py_DECREF(next_item);
return NULL; return NULL;
}
en->en_longindex = stepped_up; en->en_longindex = stepped_up;
if (result->ob_refcnt == 1) { if (result->ob_refcnt == 1) {