Skip to content

bpo-1635741: Fix winreg reference leaks #31560

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 1 commit into from
Feb 25, 2022
Merged

bpo-1635741: Fix winreg reference leaks #31560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,11 @@ _PyTypes_InitState(PyInterpreterState *interp)
}



#ifdef MS_WINDOWS
extern PyTypeObject PyHKEY_Type;
#endif

static PyTypeObject* static_types[] = {
// The two most important base types: must be initialized first and
// deallocated last.
Expand Down Expand Up @@ -1869,6 +1874,9 @@ static PyTypeObject* static_types[] = {
&PyFunction_Type,
&PyGen_Type,
&PyGetSetDescr_Type,
#ifdef MS_WINDOWS
&PyHKEY_Type,
#endif
&PyInstanceMethod_Type,
&PyListIter_Type,
&PyListRevIter_Type,
Expand Down
4 changes: 0 additions & 4 deletions PC/winreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2046,11 +2046,9 @@ PyMODINIT_FUNC PyInit_winreg(void)
PyHKEY_Type.tp_doc = PyHKEY_doc;
if (PyType_Ready(&PyHKEY_Type) < 0)
return NULL;
Py_INCREF(&PyHKEY_Type);
if (PyDict_SetItemString(d, "HKEYType",
(PyObject *)&PyHKEY_Type) != 0)
return NULL;
Py_INCREF(PyExc_OSError);
if (PyDict_SetItemString(d, "error",
PyExc_OSError) != 0)
return NULL;
Expand Down Expand Up @@ -2116,5 +2114,3 @@ PyMODINIT_FUNC PyInit_winreg(void)
ADD_INT(REG_RESOURCE_REQUIREMENTS_LIST);
return m;
}