bpo-42327: C API: Add PyModule_Add() function (GH-23443)

It is a fixed implementation of PyModule_AddObject() which consistently
steals reference both on success and on failure.
This commit is contained in:
Serhiy Storchaka 2023-07-18 09:42:05 +03:00 committed by GitHub
parent 745492355b
commit 83ac128490
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 61 additions and 56 deletions

View file

@ -606,13 +606,16 @@ PyModule_AddObjectRef(PyObject *mod, const char *name, PyObject *value)
PyModule_GetName(mod));
return -1;
}
if (PyDict_SetItemString(dict, name, value)) {
return -1;
}
return 0;
return PyDict_SetItemString(dict, name, value);
}
int
PyModule_Add(PyObject *mod, const char *name, PyObject *value)
{
int res = PyModule_AddObjectRef(mod, name, value);
Py_XDECREF(value);
return res;
}
int
PyModule_AddObject(PyObject *mod, const char *name, PyObject *value)
@ -627,25 +630,13 @@ PyModule_AddObject(PyObject *mod, const char *name, PyObject *value)
int
PyModule_AddIntConstant(PyObject *m, const char *name, long value)
{
PyObject *obj = PyLong_FromLong(value);
if (!obj) {
return -1;
}
int res = PyModule_AddObjectRef(m, name, obj);
Py_DECREF(obj);
return res;
return PyModule_Add(m, name, PyLong_FromLong(value));
}
int
PyModule_AddStringConstant(PyObject *m, const char *name, const char *value)
{
PyObject *obj = PyUnicode_FromString(value);
if (!obj) {
return -1;
}
int res = PyModule_AddObjectRef(m, name, obj);
Py_DECREF(obj);
return res;
return PyModule_Add(m, name, PyUnicode_FromString(value));
}
int