mirror of
https://github.com/python/cpython
synced 2024-09-19 15:21:30 +00:00
Repair refcounting on error return from type_set_bases.
Include a test case that failed for one of my efforts to repair this.
This commit is contained in:
parent
bb18f620ad
commit
e723e453a1
|
@ -3585,6 +3585,13 @@ class L(list):
|
|||
# actually, we'll have crashed by here...
|
||||
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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue