commit 8ffbab8d02ca6aa925a8f339b71c6677b9c49fb6
author Petri Lehtinen <petri@digip.org> Mon Oct 24 20:59:29 2011 +0300
committer Petri Lehtinen <petri@digip.org> Mon Oct 24 20:59:29 2011 +0300
tree 43e75eb20ac401f2068f8fbb29e7273f48e53e63
parent c8065e46fed927b35310bddcc0adf8898ff9c784

Issue #13018: Fix reference leaks in error paths in dictobject.c.
Patch by Suman Saha.

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index e8f8b4a..f2ebf45 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1335,14 +1335,18 @@
         PyObject *key;
         long hash;
 
-        if (dictresize(mp, Py_SIZE(seq)))
+        if (dictresize(mp, Py_SIZE(seq))) {
+            Py_DECREF(d);
             return NULL;
+        }
 
         while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) {
             Py_INCREF(key);
             Py_INCREF(value);
-            if (insertdict(mp, key, hash, value))
+            if (insertdict(mp, key, hash, value)) {
+                Py_DECREF(d);
                 return NULL;
+            }
         }
         return d;
     }
@@ -1353,14 +1357,18 @@
         PyObject *key;
         long hash;
 
-        if (dictresize(mp, PySet_GET_SIZE(seq)))
+        if (dictresize(mp, PySet_GET_SIZE(seq))) {
+            Py_DECREF(d);
             return NULL;
+        }
 
         while (_PySet_NextEntry(seq, &pos, &key, &hash)) {
             Py_INCREF(key);
             Py_INCREF(value);
-            if (insertdict(mp, key, hash, value))
+            if (insertdict(mp, key, hash, value)) {
+                Py_DECREF(d);
                 return NULL;
+            }
         }
         return d;
     }