[Python-checkins] [3.12] gh-86493: Fix possible leaks in modules initialization: _curses_panel, _decimal, posix, xxsubtype (GH-106767) (#106849)
serhiy-storchaka
webhook-mailer at python.org
Tue Jul 18 03:04:02 EDT 2023
https://github.com/python/cpython/commit/970cb8eabaaf5a8311f1aba4ca4968ef7385fce8
commit: 970cb8eabaaf5a8311f1aba4ca4968ef7385fce8
branch: 3.12
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2023-07-18T10:03:59+03:00
summary:
[3.12] gh-86493: Fix possible leaks in modules initialization: _curses_panel, _decimal, posix, xxsubtype (GH-106767) (#106849)
(cherry picked from commit 745492355b94d109e47827e5865846f25ae42d26)
files:
M Modules/_curses_panel.c
M Modules/_decimal/_decimal.c
M Modules/posixmodule.c
M Modules/xxsubtype.c
diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index a3124ff80551e..292b57c083d0c 100644
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -662,8 +662,7 @@ _curses_panel_exec(PyObject *mod)
state->PyCursesError = PyErr_NewException(
"_curses_panel.error", NULL, NULL);
- if (PyModule_AddObject(mod, "error", Py_NewRef(state->PyCursesError)) < 0) {
- Py_DECREF(state->PyCursesError);
+ if (PyModule_AddObjectRef(mod, "error", state->PyCursesError) < 0) {
return -1;
}
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index 0005081f7c5e8..70e18edb46453 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -5871,16 +5871,15 @@ PyInit__decimal(void)
ASSIGN_PTR(m, PyModule_Create(&_decimal_module));
/* Add types to the module */
- CHECK_INT(PyModule_AddObject(m, "Decimal", Py_NewRef(&PyDec_Type)));
- CHECK_INT(PyModule_AddObject(m, "Context",
- Py_NewRef(&PyDecContext_Type)));
- CHECK_INT(PyModule_AddObject(m, "DecimalTuple", Py_NewRef(DecimalTuple)));
+ CHECK_INT(PyModule_AddObjectRef(m, "Decimal", (PyObject *)&PyDec_Type));
+ CHECK_INT(PyModule_AddObjectRef(m, "Context", (PyObject *)&PyDecContext_Type));
+ CHECK_INT(PyModule_AddObjectRef(m, "DecimalTuple", (PyObject *)DecimalTuple));
/* Create top level exception */
ASSIGN_PTR(DecimalException, PyErr_NewException(
"decimal.DecimalException",
PyExc_ArithmeticError, NULL));
- CHECK_INT(PyModule_AddObject(m, "DecimalException", Py_NewRef(DecimalException)));
+ CHECK_INT(PyModule_AddObjectRef(m, "DecimalException", DecimalException));
/* Create signal tuple */
ASSIGN_PTR(SignalTuple, PyTuple_New(SIGNAL_MAP_LEN));
@@ -5920,7 +5919,7 @@ PyInit__decimal(void)
Py_DECREF(base);
/* add to module */
- CHECK_INT(PyModule_AddObject(m, cm->name, Py_NewRef(cm->ex)));
+ CHECK_INT(PyModule_AddObjectRef(m, cm->name, cm->ex));
/* add to signal tuple */
PyTuple_SET_ITEM(SignalTuple, i, Py_NewRef(cm->ex));
@@ -5949,38 +5948,38 @@ PyInit__decimal(void)
ASSIGN_PTR(cm->ex, PyErr_NewException(cm->fqname, base, NULL));
Py_DECREF(base);
- CHECK_INT(PyModule_AddObject(m, cm->name, Py_NewRef(cm->ex)));
+ CHECK_INT(PyModule_AddObjectRef(m, cm->name, cm->ex));
}
/* Init default context template first */
ASSIGN_PTR(default_context_template,
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
- CHECK_INT(PyModule_AddObject(m, "DefaultContext",
- Py_NewRef(default_context_template)));
+ CHECK_INT(PyModule_AddObjectRef(m, "DefaultContext",
+ default_context_template));
#ifndef WITH_DECIMAL_CONTEXTVAR
ASSIGN_PTR(tls_context_key, PyUnicode_FromString("___DECIMAL_CTX__"));
- CHECK_INT(PyModule_AddObject(m, "HAVE_CONTEXTVAR", Py_NewRef(Py_False)));
+ CHECK_INT(PyModule_AddObjectRef(m, "HAVE_CONTEXTVAR", Py_False));
#else
ASSIGN_PTR(current_context_var, PyContextVar_New("decimal_context", NULL));
- CHECK_INT(PyModule_AddObject(m, "HAVE_CONTEXTVAR", Py_NewRef(Py_True)));
+ CHECK_INT(PyModule_AddObjectRef(m, "HAVE_CONTEXTVAR", Py_True));
#endif
- CHECK_INT(PyModule_AddObject(m, "HAVE_THREADS", Py_NewRef(Py_True)));
+ CHECK_INT(PyModule_AddObjectRef(m, "HAVE_THREADS", Py_True));
/* Init basic context template */
ASSIGN_PTR(basic_context_template,
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
init_basic_context(basic_context_template);
- CHECK_INT(PyModule_AddObject(m, "BasicContext",
- Py_NewRef(basic_context_template)));
+ CHECK_INT(PyModule_AddObjectRef(m, "BasicContext",
+ basic_context_template));
/* Init extended context template */
ASSIGN_PTR(extended_context_template,
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
init_extended_context(extended_context_template);
- CHECK_INT(PyModule_AddObject(m, "ExtendedContext",
- Py_NewRef(extended_context_template)));
+ CHECK_INT(PyModule_AddObjectRef(m, "ExtendedContext",
+ extended_context_template));
/* Init mpd_ssize_t constants */
@@ -5999,7 +5998,7 @@ PyInit__decimal(void)
/* Init string constants */
for (i = 0; i < _PY_DEC_ROUND_GUARD; i++) {
ASSIGN_PTR(round_map[i], PyUnicode_InternFromString(mpd_round_string[i]));
- CHECK_INT(PyModule_AddObject(m, mpd_round_string[i], Py_NewRef(round_map[i])));
+ CHECK_INT(PyModule_AddObjectRef(m, mpd_round_string[i], round_map[i]));
}
/* Add specification version number */
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 81c9990220893..0f82f1afa07aa 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -16790,57 +16790,49 @@ posixmodule_exec(PyObject *m)
if (setup_confname_tables(m))
return -1;
- PyModule_AddObject(m, "error", Py_NewRef(PyExc_OSError));
+ if (PyModule_AddObjectRef(m, "error", PyExc_OSError) < 0) {
+ return -1;
+ }
#if defined(HAVE_WAITID) && !defined(__APPLE__)
waitid_result_desc.name = MODNAME ".waitid_result";
- PyObject *WaitidResultType = (PyObject *)PyStructSequence_NewType(&waitid_result_desc);
- if (WaitidResultType == NULL) {
+ state->WaitidResultType = (PyObject *)PyStructSequence_NewType(&waitid_result_desc);
+ if (PyModule_AddObjectRef(m, "waitid_result", state->WaitidResultType) < 0) {
return -1;
}
- PyModule_AddObject(m, "waitid_result", Py_NewRef(WaitidResultType));
- state->WaitidResultType = WaitidResultType;
#endif
stat_result_desc.name = "os.stat_result"; /* see issue #19209 */
stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
- PyObject *StatResultType = (PyObject *)PyStructSequence_NewType(&stat_result_desc);
- if (StatResultType == NULL) {
+ state->StatResultType = (PyObject *)PyStructSequence_NewType(&stat_result_desc);
+ if (PyModule_AddObjectRef(m, "stat_result", state->StatResultType) < 0) {
return -1;
}
- PyModule_AddObject(m, "stat_result", Py_NewRef(StatResultType));
- state->StatResultType = StatResultType;
- state->statresult_new_orig = ((PyTypeObject *)StatResultType)->tp_new;
- ((PyTypeObject *)StatResultType)->tp_new = statresult_new;
+ state->statresult_new_orig = ((PyTypeObject *)state->StatResultType)->tp_new;
+ ((PyTypeObject *)state->StatResultType)->tp_new = statresult_new;
statvfs_result_desc.name = "os.statvfs_result"; /* see issue #19209 */
- PyObject *StatVFSResultType = (PyObject *)PyStructSequence_NewType(&statvfs_result_desc);
- if (StatVFSResultType == NULL) {
+ state->StatVFSResultType = (PyObject *)PyStructSequence_NewType(&statvfs_result_desc);
+ if (PyModule_AddObjectRef(m, "statvfs_result", state->StatVFSResultType) < 0) {
return -1;
}
- PyModule_AddObject(m, "statvfs_result", Py_NewRef(StatVFSResultType));
- state->StatVFSResultType = StatVFSResultType;
#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
sched_param_desc.name = MODNAME ".sched_param";
- PyObject *SchedParamType = (PyObject *)PyStructSequence_NewType(&sched_param_desc);
- if (SchedParamType == NULL) {
+ state->SchedParamType = (PyObject *)PyStructSequence_NewType(&sched_param_desc);
+ if (PyModule_AddObjectRef(m, "sched_param", state->SchedParamType) < 0) {
return -1;
}
- PyModule_AddObject(m, "sched_param", Py_NewRef(SchedParamType));
- state->SchedParamType = SchedParamType;
- ((PyTypeObject *)SchedParamType)->tp_new = os_sched_param;
+ ((PyTypeObject *)state->SchedParamType)->tp_new = os_sched_param;
#endif
/* initialize TerminalSize_info */
- PyObject *TerminalSizeType = (PyObject *)PyStructSequence_NewType(&TerminalSize_desc);
- if (TerminalSizeType == NULL) {
+ state->TerminalSizeType = (PyObject *)PyStructSequence_NewType(&TerminalSize_desc);
+ if (PyModule_AddObjectRef(m, "terminal_size", state->TerminalSizeType) < 0) {
return -1;
}
- PyModule_AddObject(m, "terminal_size", Py_NewRef(TerminalSizeType));
- state->TerminalSizeType = TerminalSizeType;
/* initialize scandir types */
PyObject *ScandirIteratorType = PyType_FromModuleAndSpec(m, &ScandirIteratorType_spec, NULL);
@@ -16849,28 +16841,21 @@ posixmodule_exec(PyObject *m)
}
state->ScandirIteratorType = ScandirIteratorType;
- PyObject *DirEntryType = PyType_FromModuleAndSpec(m, &DirEntryType_spec, NULL);
- if (DirEntryType == NULL) {
+ state->DirEntryType = PyType_FromModuleAndSpec(m, &DirEntryType_spec, NULL);
+ if (PyModule_AddObjectRef(m, "DirEntry", state->DirEntryType) < 0) {
return -1;
}
- PyModule_AddObject(m, "DirEntry", Py_NewRef(DirEntryType));
- state->DirEntryType = DirEntryType;
times_result_desc.name = MODNAME ".times_result";
- PyObject *TimesResultType = (PyObject *)PyStructSequence_NewType(×_result_desc);
- if (TimesResultType == NULL) {
+ state->TimesResultType = (PyObject *)PyStructSequence_NewType(×_result_desc);
+ if (PyModule_AddObjectRef(m, "times_result", state->TimesResultType) < 0) {
return -1;
}
- PyModule_AddObject(m, "times_result", Py_NewRef(TimesResultType));
- state->TimesResultType = TimesResultType;
- PyTypeObject *UnameResultType = PyStructSequence_NewType(&uname_result_desc);
- if (UnameResultType == NULL) {
+ state->UnameResultType = (PyObject *)PyStructSequence_NewType(&uname_result_desc);
+ if (PyModule_AddObjectRef(m, "uname_result", state->UnameResultType) < 0) {
return -1;
}
- ;
- PyModule_AddObject(m, "uname_result", Py_NewRef(UnameResultType));
- state->UnameResultType = (PyObject *)UnameResultType;
if ((state->billion = PyLong_FromLong(1000000000)) == NULL)
return -1;
diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c
index 744ba7bf5d28b..9e4a3d66ef41b 100644
--- a/Modules/xxsubtype.c
+++ b/Modules/xxsubtype.c
@@ -274,12 +274,10 @@ xxsubtype_exec(PyObject* m)
if (PyType_Ready(&spamdict_type) < 0)
return -1;
- if (PyModule_AddObject(m, "spamlist",
- Py_NewRef(&spamlist_type)) < 0)
+ if (PyModule_AddObjectRef(m, "spamlist", (PyObject *)&spamlist_type) < 0)
return -1;
- if (PyModule_AddObject(m, "spamdict",
- Py_NewRef(&spamdict_type)) < 0)
+ if (PyModule_AddObjectRef(m, "spamdict", (PyObject *)&spamdict_type) < 0)
return -1;
return 0;
}
More information about the Python-checkins
mailing list