diff options
| author | Jesus Cea <jcea@jcea.es> | 2012-07-19 21:18:07 +0200 |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2012-07-19 21:18:07 +0200 |
| commit | ef86d12979b878bd5f3a1ffc73f5373c722eb664 (patch) | |
| tree | 6a4f6fca1349d1e8beb3d9ff6675ee40a26ce151 | |
| parent | 29e49d63942cc75ead85a4cb77dea34285be9fcc (diff) | |
| download | cpython-git-ef86d12979b878bd5f3a1ffc73f5373c722eb664.tar.gz | |
Closes #15396: memory leak in tkinter
| -rw-r--r-- | Doc/ACKS.txt | 1 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index 70063c08fb..03e1a6badc 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 3608e2d993..23906dea90 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; |