diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2013-04-13 14:30:16 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2013-04-13 14:30:16 (GMT) |
| commit | 548677bb8ce759395e2512420c03ccb184a77bf5 (patch) | |
| tree | 8173bcb8656bbddd77dc5a3ca65b1870f7394b69 /Objects | |
| parent | 4e7d3ab405ddedcc53617bc08bcc64d59f29a3bf (diff) | |
| parent | 64aafeb4de3b5e85007f2107250e6f1da4df2516 (diff) | |
| download | cpython-548677bb8ce759395e2512420c03ccb184a77bf5.zip cpython-548677bb8ce759395e2512420c03ccb184a77bf5.tar.gz cpython-548677bb8ce759395e2512420c03ccb184a77bf5.tar.bz2 | |
Issue #16447: Merge fix from 3.3.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 0c881b7..5093452 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -298,10 +298,13 @@ type_set_name(PyTypeObject *type, PyObject *value, void *context) Py_INCREF(value); - Py_DECREF(et->ht_name); + /* Wait until et is a sane state before Py_DECREF'ing the old et->ht_name + value. (Bug #16447.) */ + tmp = et->ht_name; et->ht_name = value; type->tp_name = tp_name; + Py_DECREF(tmp); return 0; } |