diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-29 09:54:17 +0200 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-29 09:54:17 +0200 |
commit | 5d1b8611159db32c7a142602fdd7c1bbbac8b2f6 (patch) | |
tree | 1447be07195a6431df94b1c6f6b1a37970492d2c /Objects | |
parent | 1080d61e0de213a819a8e19dc94f5aa349c2bb24 (diff) | |
download | cpython-5d1b8611159db32c7a142602fdd7c1bbbac8b2f6.tar.gz |
Issue #28797: Modifying the class __dict__ inside the __set_name__ method of
a descriptor that is used inside that class no longer prevents calling the
__set_name__ method of other descriptors.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/typeobject.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 606e08e449..04da32bdfa 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -7004,10 +7004,14 @@ update_all_slots(PyTypeObject* type) static int set_names(PyTypeObject *type) { - PyObject *key, *value, *set_name, *tmp; + PyObject *names_to_set, *key, *value, *set_name, *tmp; Py_ssize_t i = 0; - while (PyDict_Next(type->tp_dict, &i, &key, &value)) { + names_to_set = PyDict_Copy(type->tp_dict); + if (names_to_set == NULL) + return -1; + + while (PyDict_Next(names_to_set, &i, &key, &value)) { set_name = lookup_maybe(value, &PyId___set_name__); if (set_name != NULL) { tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL); @@ -7017,15 +7021,19 @@ set_names(PyTypeObject *type) "Error calling __set_name__ on '%.100s' instance %R " "in '%.100s'", value->ob_type->tp_name, key, type->tp_name); + Py_DECREF(names_to_set); return -1; } else Py_DECREF(tmp); } - else if (PyErr_Occurred()) + else if (PyErr_Occurred()) { + Py_DECREF(names_to_set); return -1; + } } + Py_DECREF(names_to_set); return 0; } |