From: Jesus Cea Date: Thu, 19 Jul 2012 19:18:07 +0000 (+0200) Subject: Closes #15396: memory leak in tkinter X-Git-Tag: v3.3.0b2~161^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef86d12979b878bd5f3a1ffc73f5373c722eb664;p=thirdparty%2FPython%2Fcpython.git Closes #15396: memory leak in tkinter --- diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index 70063c08fb55..03e1a6badc00 100644 --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -120,6 +120,7 @@ docs@python.org), and we'll be glad to correct the problem. * Thomas Lamb * Detlef Lannert * Piers Lauder + * Julia Lawall * Glyph Lefkowitz * Robert Lehmann * Marc-André Lemburg diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 3608e2d993a2..23906dea903b 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -3135,8 +3135,10 @@ PyInit__tkinter(void) PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type); - if (PyType_Ready(&Tktt_Type) < 0) + if (PyType_Ready(&Tktt_Type) < 0) { + Py_DECREF(m); return NULL; + } PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type); Py_TYPE(&PyTclObject_Type) = &PyType_Type;