]> granicus.if.org Git - python/commitdiff
[2.7] bpo-31579: Fixed a possible leak in enumerate() with large indices. (GH-3753...
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 26 Sep 2017 06:11:27 +0000 (09:11 +0300)
committerGitHub <noreply@github.com>
Tue, 26 Sep 2017 06:11:27 +0000 (09:11 +0300)
(cherry picked from commit 0e950dd22b075b4809c84afda8aede02b76ac0fa)

Objects/enumobject.c

index 1ef381f391428cb60feb5f6ef3507272d4021656..8f86a5b8de39e784c6013247768eb02b19a3993a 100644 (file)
@@ -87,19 +87,25 @@ enum_next_long(enumobject *en, PyObject* next_item)
 
     if (en->en_longindex == NULL) {
         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;
+        }
     }
     if (one == NULL) {
         one = PyInt_FromLong(1);
-        if (one == NULL)
+        if (one == NULL) {
+            Py_DECREF(next_item);
             return NULL;
+        }
     }
     next_index = en->en_longindex;
     assert(next_index != NULL);
     stepped_up = PyNumber_Add(next_index, one);
-    if (stepped_up == NULL)
+    if (stepped_up == NULL) {
+        Py_DECREF(next_item);
         return NULL;
+    }
     en->en_longindex = stepped_up;
 
     if (result->ob_refcnt == 1) {