diff options
| -rw-r--r-- | Lib/test/test_descr.py | 7 | ||||
| -rw-r--r-- | Objects/typeobject.c | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index cb13ff2e06..b3336d1fc8 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3586,6 +3586,13 @@ def test_mutable_bases(): raise TestFailed, "shouldn't be able to create inheritance cycles" try: + D.__bases__ = (C, C) + except TypeError: + pass + else: + raise TestFailed, "didn't detect repeated base classes" + + try: D.__bases__ = (E,) except TypeError: pass diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 60c4fbc6d1..2a7df8aa63 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -303,13 +303,16 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context) return r; bail: + Py_DECREF(type->tp_bases); + Py_DECREF(type->tp_base); + if (type->tp_mro != old_mro) { + Py_DECREF(type->tp_mro); + } + type->tp_bases = old_bases; type->tp_base = old_base; type->tp_mro = old_mro; - Py_DECREF(value); - Py_DECREF(new_base); - return -1; } |