Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-123504: Fix reference leak in initialization of _tkinter #123505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 9 commits into from
Sep 3, 2024
Merged

gh-123504: Fix reference leak in initialization of _tkinter #123505

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cddd021
Fix reference leak in initialization of _tkinter
ZeroIntensity Aug 30, 2024
a9eb482
Add NEWS entry.
ZeroIntensity Aug 30, 2024
36c65af
Switch to `PyModule_AddObjectRef`
ZeroIntensity Aug 30, 2024
cc291e4
Switch to a module clear function.
ZeroIntensity Aug 30, 2024
df9265f
Add back missing newline.
ZeroIntensity Aug 30, 2024
4f1f4e4
Fix formatting.
ZeroIntensity Aug 30, 2024
a77abba
Switch to `Py_CLEAR`
ZeroIntensity Aug 30, 2024
f35f2a0
Update Misc/NEWS.d/next/Library/2024-08-30-09-01-35.gh-issue-123504.l…
ZeroIntensity Sep 3, 2024
fc34562
Use dot notation for module initializer.
ZeroIntensity Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Switch to a module clear function.
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed Aug 30, 2024
commit cc291e4cdc3801f2f9592b4061570201c217cf4e
15 changes: 9 additions & 6 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3389,6 +3389,14 @@ DisableEventHook(void)
#endif
}

static void
module_free(void *mod)
{
Py_DECREF(Tkinter_TclError);
Py_DECREF(Tkapp_Type);
Py_DECREF(Tktt_Type);
Py_DECREF(PyTclObject_Type);
Comment thread
ZeroIntensity marked this conversation as resolved.
Outdated
}

static struct PyModuleDef _tkintermodule = {
PyModuleDef_HEAD_INIT,
Expand All @@ -3399,7 +3407,7 @@ static struct PyModuleDef _tkintermodule = {
NULL,
NULL,
NULL,
NULL
module_free
Comment thread
ZeroIntensity marked this conversation as resolved.
Outdated
};

PyMODINIT_FUNC
Expand All @@ -3421,7 +3429,6 @@ PyInit__tkinter(void)
Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL);
if (PyModule_AddObjectRef(m, "TclError", Tkinter_TclError)) {
Py_DECREF(m);
Py_DECREF(Tkinter_TclError);
return NULL;
}

Expand Down Expand Up @@ -3475,22 +3482,18 @@ PyInit__tkinter(void)
Py_DECREF(m);
return NULL;
}
Py_DECREF(Tkapp_Type);

Tktt_Type = PyType_FromSpec(&Tktt_Type_spec);
if (PyModule_AddObjectRef(m, "TkttType", Tktt_Type)) {
Py_DECREF(m);
return NULL;
}
Py_DECREF(Tktt_Type);

PyTclObject_Type = PyType_FromSpec(&PyTclObject_Type_spec);
if (PyModule_AddObjectRef(m, "Tcl_Obj", PyTclObject_Type)) {
Py_DECREF(m);
return NULL;
}
Py_DECREF(PyTclObject_Type);


/* This helps the dynamic loader; in Unicode aware Tcl versions
it also helps Tcl find its encodings. */
Expand Down