(original) (raw)

changeset: 85111:4d0c938870bc user: Antoine Pitrou solipsis@pitrou.net date: Sun Aug 11 00:22:30 2013 +0200 files: Misc/NEWS Modules/_tkinter.c description: Fix refcounting issue with extension types in tkinter. (issue #15721) diff -r 0fce8b90f25b -r 4d0c938870bc Misc/NEWS --- a/Misc/NEWS Sat Aug 10 17:46:48 2013 -0400 +++ b/Misc/NEWS Sun Aug 11 00:22:30 2013 +0200 @@ -24,6 +24,8 @@ Library ------- +- Fix refcounting issue with extension types in tkinter. + - Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error if methods have annotations; it now correctly displays the annotations. diff -r 0fce8b90f25b -r 4d0c938870bc Modules/_tkinter.c --- a/Modules/_tkinter.c Sat Aug 10 17:46:48 2013 -0400 +++ b/Modules/_tkinter.c Sun Aug 11 00:22:30 2013 +0200 @@ -516,6 +516,7 @@ v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type); if (v == NULL) return NULL; + Py_INCREF(Tkapp_Type); v->interp = Tcl_CreateInterp(); v->wantobjects = wantobjects; @@ -674,6 +675,7 @@ self = PyObject_New(PyTclObject, (PyTypeObject *) PyTclObject_Type); if (self == NULL) return NULL; + Py_INCREF(PyTclObject_Type); Tcl_IncrRefCount(arg); self->value = arg; self->string = NULL; @@ -683,9 +685,11 @@ static void PyTclObject_dealloc(PyTclObject *self) { + PyObject *tp = (PyObject *) Py_TYPE(self); Tcl_DecrRefCount(self->value); Py_XDECREF(self->string); PyObject_Del(self); + Py_DECREF(tp); } static char* @@ -2196,6 +2200,7 @@ v = PyObject_New(TkttObject, (PyTypeObject *) Tktt_Type); if (v == NULL) return NULL; + Py_INCREF(Tktt_Type); Py_INCREF(func); v->token = NULL; @@ -2211,10 +2216,12 @@ { TkttObject *v = (TkttObject *)self; PyObject *func = v->func; + PyObject *tp = (PyObject *) Py_TYPE(self); Py_XDECREF(func); PyObject_Del(self); + Py_DECREF(tp); } static PyObject * @@ -2520,11 +2527,13 @@ static void Tkapp_Dealloc(PyObject *self) { + PyObject *tp = (PyObject *) Py_TYPE(self); /*CHECK_TCL_APPARTMENT;*/ ENTER_TCL Tcl_DeleteInterp(Tkapp_Interp(self)); LEAVE_TCL PyObject_Del(self); + Py_DECREF(tp); DisableEventHook(); } /solipsis@pitrou.net