Skip to content

bpo-40737: Fix possible reference leak for sqlite3 initialization #20323

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
corona10 merged 15 commits into from
May 26, 2020
Merged

bpo-40737: Fix possible reference leak for sqlite3 initialization #20323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fc20024
Use PyModule_AddObject() correctly in sqlite3
May 22, 2020
a51d380
Add NEWS entry
May 22, 2020
df83c42
Update Misc/NEWS.d/next/Library/2020-05-23-00-22-11.bpo-40737.iph-CM.rst
May 25, 2020
1b5def8
Update Modules/_sqlite/module.c
May 25, 2020
9e954fb
Update Modules/_sqlite/module.c
May 25, 2020
59f6cfb
Update Modules/_sqlite/module.c
May 25, 2020
1ea05c9
Update Modules/_sqlite/module.c
May 25, 2020
37403bc
Update Modules/_sqlite/module.c
May 25, 2020
8d6e116
Use PyModule_AddType iso. PyModule_AddObject
May 25, 2020
01e89c4
Fix dot in Node name
May 25, 2020
40bab48
Set up _all_ types
May 25, 2020
d96c5e4
Revert changing initialization functions
May 26, 2020
4086825
Only add relevant types
May 26, 2020
21e6788
Revert "Fix dot in Node name"
May 26, 2020
841eab6
Update Modules/_sqlite/module.c
May 26, 2020
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-05-23-00-22-11.bpo-40737.iph-CM.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix possible reference leak for :mod:`sqlite3` initialization.
20 changes: 12 additions & 8 deletions Modules/_sqlite/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ static struct PyModuleDef _sqlite3module = {
NULL
};

#define ADD_TYPE(module, type) \
do { \
if (PyModule_AddType(module, &type) < 0) { \
Py_DECREF(module); \
return NULL; \
} \
} while (0)

PyMODINIT_FUNC PyInit__sqlite3(void)
{
PyObject *module, *dict;
Expand All @@ -366,14 +374,10 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
return NULL;
}

Py_INCREF(&pysqlite_ConnectionType);
PyModule_AddObject(module, "Connection", (PyObject*) &pysqlite_ConnectionType);
Py_INCREF(&pysqlite_CursorType);
PyModule_AddObject(module, "Cursor", (PyObject*) &pysqlite_CursorType);
Py_INCREF(&pysqlite_PrepareProtocolType);
PyModule_AddObject(module, "PrepareProtocol", (PyObject*) &pysqlite_PrepareProtocolType);
Py_INCREF(&pysqlite_RowType);
PyModule_AddObject(module, "Row", (PyObject*) &pysqlite_RowType);
ADD_TYPE(module, pysqlite_ConnectionType);
ADD_TYPE(module, pysqlite_CursorType);
ADD_TYPE(module, pysqlite_PrepareProtocolType);
ADD_TYPE(module, pysqlite_RowType);

if (!(dict = PyModule_GetDict(module))) {
goto error;
Expand Down