Skip to content

C
cpython
Kaydet (Commit) c13d85bf authored tarafından Benjamin Peterson's avatar Benjamin Peterson
Dosyalara gözat
Seçenekler

merge 3.5 (#27248) 

Patch from Xiang Zhang.
üst 77e84083 27007dcc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
Objects/typeobject.c
Dosyayı görüntüle @ c13d85bf
...@@ -4522,8 +4522,10 @@ add_members(PyTypeObject *type, PyMemberDef *memb) ...@@ -4522,8 +4522,10 @@ add_members(PyTypeObject *type, PyMemberDef *memb)
descr = PyDescr_NewMember(type, memb); descr = PyDescr_NewMember(type, memb);
if (descr == NULL) if (descr == NULL)
return -1; return -1;
if (PyDict_SetItemString(dict, memb->name, descr) < 0) if (PyDict_SetItemString(dict, memb->name, descr) < 0) {
Py_DECREF(descr);
return -1; return -1;
}
Py_DECREF(descr); Py_DECREF(descr);
} }
return 0; return 0;
...@@ -4542,8 +4544,10 @@ add_getset(PyTypeObject *type, PyGetSetDef *gsp) ...@@ -4542,8 +4544,10 @@ add_getset(PyTypeObject *type, PyGetSetDef *gsp)
if (descr == NULL) if (descr == NULL)
return -1; return -1;
if (PyDict_SetItemString(dict, gsp->name, descr) < 0) if (PyDict_SetItemString(dict, gsp->name, descr) < 0) {
Py_DECREF(descr);
return -1; return -1;
}
Py_DECREF(descr); Py_DECREF(descr);
} }
return 0; return 0;
...@@ -7023,8 +7027,10 @@ add_operators(PyTypeObject *type) ...@@ -7023,8 +7027,10 @@ add_operators(PyTypeObject *type)
descr = PyDescr_NewWrapper(type, p, *ptr); descr = PyDescr_NewWrapper(type, p, *ptr);
if (descr == NULL) if (descr == NULL)
return -1; 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; return -1;
}
Py_DECREF(descr); Py_DECREF(descr);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment