merge 3.2

3e6267e7 · Benjamin Peterson · c4085c84 · ae13c88d · 3e6267e7
Kaydet (Commit) 3e6267e7 authored Agu 17, 2011 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

typeobject.c Objects/typeobject.c +3 -1

No files found.
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2091,8 +2091,10 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
                 PyUnicode_CompareWithASCIIString(tmp, "__weakref__") == 0))
                continue;
            tmp =_Py_Mangle(name, tmp);
-            if (!tmp)
+            if (!tmp) {
+                Py_DECREF(newslots);
                goto bad_slots;
+            }
            PyList_SET_ITEM(newslots, j, tmp);
            if (PyDict_GetItem(dict, tmp)) {
                PyErr_Format(PyExc_ValueError,