[Python-checkins] cpython (2.7): fix refleaks in PyDict_SetItem error cases (closes #27248)

benjamin.peterson python-checkins at python.org
Thu Jul 7 02:28:35 EDT 2016


https://hg.python.org/cpython/rev/370b2985d462
changeset:   102273:370b2985d462
branch:      2.7
parent:      102269:539b4e7a655e
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jul 06 23:26:32 2016 -0700
summary:
  fix refleaks in PyDict_SetItem error cases (closes #27248)

files:
  Objects/typeobject.c |  12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3693,8 +3693,10 @@
         descr = PyDescr_NewMember(type, memb);
         if (descr == NULL)
             return -1;
-        if (PyDict_SetItemString(dict, memb->name, descr) < 0)
+        if (PyDict_SetItemString(dict, memb->name, descr) < 0) {
+            Py_DECREF(descr);
             return -1;
+        }
         Py_DECREF(descr);
     }
     return 0;
@@ -3713,8 +3715,10 @@
 
         if (descr == NULL)
             return -1;
-        if (PyDict_SetItemString(dict, gsp->name, descr) < 0)
+        if (PyDict_SetItemString(dict, gsp->name, descr) < 0) {
+            Py_DECREF(descr);
             return -1;
+        }
         Py_DECREF(descr);
     }
     return 0;
@@ -6498,8 +6502,10 @@
             descr = PyDescr_NewWrapper(type, p, *ptr);
             if (descr == NULL)
                 return -1;
-            if (PyDict_SetItem(dict, p->name_strobj, descr) < 0)
+            if (PyDict_SetItem(dict, p->name_strobj, descr) < 0) {
+                Py_DECREF(descr);
                 return -1;
+            }
             Py_DECREF(descr);
         }
     }

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list