bpo-1635741: _sqlite3 uses PyModule_AddObjectRef

Modules/_sqlite/microprotocols.c

@@ -38,17 +38,17 @@ static PyObject *psyco_adapters = NULL;
 int
 pysqlite_microprotocols_init(PyObject *module)
 {
+ int res;
+
  /* create adapters dictionary and put it in module namespace */
  if ((psyco_adapters = PyDict_New()) == NULL) {
  return -1;
  }
 
- if (PyModule_AddObject(module, "adapters", psyco_adapters) < 0) {
- Py_DECREF(psyco_adapters);
- return -1;
- }
+ res = PyModule_AddObjectRef(module, "adapters", psyco_adapters);
+ Py_DECREF(psyco_adapters);
 
- return 0;
+ return res;
 }
 
 

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[] = {
@@ -357,12 +357,14 @@ do { \
 
 #define ADD_EXCEPTION(module, name, exc, base) \
 do { \
+ int res; \
  exc = PyErr_NewException(MODULE_NAME "." name, base, NULL); \
  if (!exc) { \
  goto error; \
  } \
- if (PyModule_AddObject(module, name, exc) < 0) { \
- Py_DECREF(exc); \
+ res = PyModule_AddObjectRef(module, name, exc); \
+ Py_DECREF(exc); \
+ if (res == -1) { \
  goto error; \
  } \
 } while (0)
@@ -417,8 +419,9 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
  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);
+ int res = PyModule_AddObjectRef(module, "OptimizedUnicode", (PyObject*)&PyUnicode_Type);
+ Py_DECREF((PyObject*)&PyUnicode_Type);
+ if (res == -1) {
  goto error;
  }
 
@@ -441,7 +444,9 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
  }
 
  /* initialize the default converters */
- converters_init(module);
+ if (converters_init(module) < 0) {
+ goto error;
+ }
 
 error:
  if (PyErr_Occurred())