diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c
index cf1fefd671851d..41f086791ea4b7 100644
--- a/Modules/_sqlite/microprotocols.c
+++ b/Modules/_sqlite/microprotocols.c
@@ -43,12 +43,10 @@ pysqlite_microprotocols_init(PyObject *module)
return -1;
}
- if (PyModule_AddObject(module, "adapters", psyco_adapters) < 0) {
- Py_DECREF(psyco_adapters);
- return -1;
- }
+ int res = PyModule_AddObjectRef(module, "adapters", psyco_adapters);
+ Py_DECREF(psyco_adapters);
- return 0;
+ return res;
}
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 33324402385f44..9fdf51417ed883 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -263,17 +263,17 @@ pysqlite_adapt_impl(PyObject *module, PyObject *obj, PyObject *proto,
return pysqlite_microprotocols_adapt(obj, proto, alt);
}
-static void converters_init(PyObject* module)
+static int converters_init(PyObject* module)
{
_pysqlite_converters = PyDict_New();
if (!_pysqlite_converters) {
- return;
+ return -1;
}
- if (PyModule_AddObject(module, "converters", _pysqlite_converters) < 0) {
- Py_DECREF(_pysqlite_converters);
- }
- return;
+ int res = PyModule_AddObjectRef(module, "converters", _pysqlite_converters);
+ Py_DECREF(_pysqlite_converters);
+
+ return res;
}
static PyMethodDef module_methods[] = {
@@ -361,8 +361,9 @@ do { \
if (!exc) { \
goto error; \
} \
- if (PyModule_AddObject(module, name, exc) < 0) { \
- Py_DECREF(exc); \
+ int res = PyModule_AddObjectRef(module, name, exc); \
+ Py_DECREF(exc); \
+ if (res < 0) { \
goto error; \
} \
} while (0)
@@ -416,9 +417,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
non-ASCII data and bytestrings to be returned for ASCII data.
Now OptimizedUnicode is an alias for str, so it has no
effect. */
- Py_INCREF((PyObject*)&PyUnicode_Type);
- if (PyModule_AddObject(module, "OptimizedUnicode", (PyObject*)&PyUnicode_Type) < 0) {
- Py_DECREF((PyObject*)&PyUnicode_Type);
+ if (PyModule_AddObjectRef(module, "OptimizedUnicode", (PyObject*)&PyUnicode_Type) < 0) {
goto error;
}
@@ -441,7 +440,9 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
}
/* initialize the default converters */
- converters_init(module);
+ if (converters_init(module) < 0) {
+ goto error;
+ }
error:
if (PyErr_Occurred())
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy