python · corona10 · May 26, 2020 · May 22, 2020 · May 22, 2020 · May 25, 2020
diff --git a/Misc/NEWS.d/next/Library/2020-05-23-00-22-11.bpo-40737.iph-CM.rst b/Misc/NEWS.d/next/Library/2020-05-23-00-22-11.bpo-40737.iph-CM.rst
@@ -0,0 +1 @@
+Fix possible reference leak for :mod:`sqlite3` initialization.
diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c
@@ -263,7 +263,7 @@ static PyMethodDef cache_methods[] = {
 
 PyTypeObject pysqlite_NodeType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        MODULE_NAME "Node",                             /* tp_name */
+        MODULE_NAME ".Node",                             /* tp_name */
         sizeof(pysqlite_Node),                          /* tp_basicsize */
         0,                                              /* tp_itemsize */
         (destructor)pysqlite_node_dealloc,              /* tp_dealloc */
@@ -345,18 +345,8 @@ PyTypeObject pysqlite_CacheType = {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_cache_setup_types(void)
+extern void pysqlite_cache_setup_types(void)
 {
-    int rc;
-
     pysqlite_NodeType.tp_new = PyType_GenericNew;
     pysqlite_CacheType.tp_new = PyType_GenericNew;
-
-    rc = PyType_Ready(&pysqlite_NodeType);
-    if (rc < 0) {
-        return rc;
-    }
-
-    rc = PyType_Ready(&pysqlite_CacheType);
-    return rc;
 }
diff --git a/Modules/_sqlite/cache.h b/Modules/_sqlite/cache.h
@@ -69,6 +69,6 @@ int pysqlite_cache_init(pysqlite_Cache* self, PyObject* args, PyObject* kwargs);
 void pysqlite_cache_dealloc(pysqlite_Cache* self);
 PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args);
 
-int pysqlite_cache_setup_types(void);
+void pysqlite_cache_setup_types(void);
 
 #endif
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -1872,8 +1872,7 @@ PyTypeObject pysqlite_ConnectionType = {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_connection_setup_types(void)
+extern void pysqlite_connection_setup_types(void)
 {
     pysqlite_ConnectionType.tp_new = PyType_GenericNew;
-    return PyType_Ready(&pysqlite_ConnectionType);
 }
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -122,6 +122,6 @@ int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObjec
 int pysqlite_check_thread(pysqlite_Connection* self);
 int pysqlite_check_connection(pysqlite_Connection* con);
 
-int pysqlite_connection_setup_types(void);
+void pysqlite_connection_setup_types(void);
 
 #endif
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -946,8 +946,7 @@ PyTypeObject pysqlite_CursorType = {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_cursor_setup_types(void)
+extern void pysqlite_cursor_setup_types(void)
 {
     pysqlite_CursorType.tp_new = PyType_GenericNew;
-    return PyType_Ready(&pysqlite_CursorType);
 }
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
@@ -64,7 +64,7 @@ PyObject* pysqlite_cursor_fetchall(pysqlite_Cursor* self, PyObject* args);
 PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args);
 PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args);
 
-int pysqlite_cursor_setup_types(void);
+void pysqlite_cursor_setup_types(void);
 
 #define UNKNOWN (-1)
 #endif
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
@@ -346,34 +346,38 @@ 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;
     PyObject *tmp_obj;
     int i;
 
-    module = PyModule_Create(&_sqlite3module);
-
-    if (!module ||
-        (pysqlite_row_setup_types() < 0) ||
        (pysqlite_cursor_setup_types() < 0) ||
-        (pysqlite_connection_setup_types() < 0) ||
-        (pysqlite_cache_setup_types() < 0) ||
-        (pysqlite_statement_setup_types() < 0) ||
-        (pysqlite_prepare_protocol_setup_types() < 0)
-       ) {
-        Py_XDECREF(module);
+    if (!(module = PyModule_Create(&_sqlite3module))) {
         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);
+    pysqlite_cache_setup_types();
+    pysqlite_connection_setup_types();
+    pysqlite_cursor_setup_types();
+    pysqlite_prepare_protocol_setup_types();
+    pysqlite_row_setup_types();
+    pysqlite_statement_setup_types();
+
+    ADD_TYPE(module, pysqlite_CacheType);
+    ADD_TYPE(module, pysqlite_ConnectionType);
+    ADD_TYPE(module, pysqlite_CursorType);
+    ADD_TYPE(module, pysqlite_NodeType);
+    ADD_TYPE(module, pysqlite_PrepareProtocolType);
+    ADD_TYPE(module, pysqlite_RowType);
+    ADD_TYPE(module, pysqlite_StatementType);
 
     if (!(dict = PyModule_GetDict(module))) {
         goto error;

diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
@@ -75,9 +75,8 @@ PyTypeObject pysqlite_PrepareProtocolType= {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_prepare_protocol_setup_types(void)
+extern void pysqlite_prepare_protocol_setup_types(void)
 {
     pysqlite_PrepareProtocolType.tp_new = PyType_GenericNew;
     Py_SET_TYPE(&pysqlite_PrepareProtocolType, &PyType_Type);
-    return PyType_Ready(&pysqlite_PrepareProtocolType);
 }
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
@@ -36,7 +36,7 @@ extern PyTypeObject pysqlite_PrepareProtocolType;
 int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol* self, PyObject* args, PyObject* kwargs);
 void pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol* self);
 
-int pysqlite_prepare_protocol_setup_types(void);
+void pysqlite_prepare_protocol_setup_types(void);
 
 #define UNKNOWN (-1)
 #endif
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
@@ -269,10 +269,9 @@ PyTypeObject pysqlite_RowType = {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_row_setup_types(void)
+extern void pysqlite_row_setup_types(void)
 {
     pysqlite_RowType.tp_new = pysqlite_row_new;
     pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping;
     pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence;
-    return PyType_Ready(&pysqlite_RowType);
 }
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
@@ -35,6 +35,6 @@ typedef struct _Row
 
 extern PyTypeObject pysqlite_RowType;
 
-int pysqlite_row_setup_types(void);
+void pysqlite_row_setup_types(void);
 
 #endif
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
@@ -497,8 +497,7 @@ PyTypeObject pysqlite_StatementType = {
         0                                               /* tp_free */
 };
 
-extern int pysqlite_statement_setup_types(void)
+extern void pysqlite_statement_setup_types(void)
 {
     pysqlite_StatementType.tp_new = PyType_GenericNew;
-    return PyType_Ready(&pysqlite_StatementType);
 }
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -55,6 +55,6 @@ int pysqlite_statement_finalize(pysqlite_Statement* self);
 int pysqlite_statement_reset(pysqlite_Statement* self);
 void pysqlite_statement_mark_dirty(pysqlite_Statement* self);
 
-int pysqlite_statement_setup_types(void);
+void pysqlite_statement_setup_types(void);
 
 #endif
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix possible reference leak for :mod:`sqlite3` initialization.