mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-07 17:57:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-1635741: Fix winreg reference leaks (GH-31560)

Browse source 
Clear also the PyHKEY_Type static type at exit.
This commit is contained in:
Victor Stinner 2022-02-25 12:34:00 +01:00 • committed by GitHub
parent e2e72567a1
commit 4657bf7016
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/object.c
View file

@ -1825,6 +1825,11 @@ _PyTypes_InitState(PyInterpreterState *interp)
} }
#ifdef MS_WINDOWS
extern PyTypeObject PyHKEY_Type;
#endif
static PyTypeObject* static_types[] = { static PyTypeObject* static_types[] = {
// The two most important base types: must be initialized first and // The two most important base types: must be initialized first and
// deallocated last. // deallocated last.
@ -1869,6 +1874,9 @@ static PyTypeObject* static_types[] = {
&PyFunction_Type, &PyFunction_Type,
&PyGen_Type, &PyGen_Type,
&PyGetSetDescr_Type, &PyGetSetDescr_Type,
#ifdef MS_WINDOWS
&PyHKEY_Type,
#endif
&PyInstanceMethod_Type, &PyInstanceMethod_Type,
&PyListIter_Type, &PyListIter_Type,
&PyListRevIter_Type, &PyListRevIter_Type,

4
PC/winreg.c
View file

@ -2046,11 +2046,9 @@ PyMODINIT_FUNC PyInit_winreg(void)
PyHKEY_Type.tp_doc = PyHKEY_doc; PyHKEY_Type.tp_doc = PyHKEY_doc;
if (PyType_Ready(&PyHKEY_Type) < 0) if (PyType_Ready(&PyHKEY_Type) < 0)
return NULL; return NULL;
Py_INCREF(&PyHKEY_Type);
if (PyDict_SetItemString(d, "HKEYType", if (PyDict_SetItemString(d, "HKEYType",
(PyObject *)&PyHKEY_Type) != 0) (PyObject *)&PyHKEY_Type) != 0)
return NULL; return NULL;
Py_INCREF(PyExc_OSError);
if (PyDict_SetItemString(d, "error", if (PyDict_SetItemString(d, "error",
PyExc_OSError) != 0) PyExc_OSError) != 0)
return NULL; return NULL;
@ -2116,5 +2114,3 @@ PyMODINIT_FUNC PyInit_winreg(void)
ADD_INT(REG_RESOURCE_REQUIREMENTS_LIST); ADD_INT(REG_RESOURCE_REQUIREMENTS_LIST);
return m; return m;
} }