Skip to content

Commit 9ef7a62

Browse files
committed
pythongh-145376: Fix various reference leaks
1 parent a1ec746 commit 9ef7a62

9 files changed

Lines changed: 42 additions & 37 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix reference leaks in various unusual error scenarios.

‎Modules/_testcapi/docstring.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ _PyTestCapi_Init_Docstring(PyObject *mod)
200200
if (PyModule_AddType(mod, &DocStringUnrepresentableSignatureTest) < 0) {
201201
return -1;
202202
}
203-
if (PyModule_AddObject(mod, "ONE", PyLong_FromLong(1)) < 0) {
203+
if (PyModule_Add(mod, "ONE", PyLong_FromLong(1)) < 0) {
204204
return -1;
205205
}
206206
return 0;

‎Modules/_testcapi/time.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ _PyTestCapi_Init_Time(PyObject *m)
158158
return -1;
159159
}
160160
Py_BUILD_ASSERT(sizeof(long long) == sizeof(PyTime_t));
161-
if (PyModule_AddObject(m, "PyTime_MIN", PyLong_FromLongLong(PyTime_MIN)) < 0) {
161+
if (PyModule_Add(m, "PyTime_MIN", PyLong_FromLongLong(PyTime_MIN)) < 0) {
162162
return 1;
163163
}
164-
if (PyModule_AddObject(m, "PyTime_MAX", PyLong_FromLongLong(PyTime_MAX)) < 0) {
164+
if (PyModule_Add(m, "PyTime_MAX", PyLong_FromLongLong(PyTime_MAX)) < 0) {
165165
return 1;
166166
}
167167
return 0;

‎Modules/_testcapimodule.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3321,43 +3321,43 @@ _testcapi_exec(PyObject *m)
33213321
Py_INCREF(&MethStatic_Type);
33223322
PyModule_AddObject(m, "MethStatic", (PyObject *)&MethStatic_Type);
33233323

3324-
PyModule_AddObject(m, "CHAR_MAX", PyLong_FromLong(CHAR_MAX));
3325-
PyModule_AddObject(m, "CHAR_MIN", PyLong_FromLong(CHAR_MIN));
3326-
PyModule_AddObject(m, "UCHAR_MAX", PyLong_FromLong(UCHAR_MAX));
3327-
PyModule_AddObject(m, "SHRT_MAX", PyLong_FromLong(SHRT_MAX));
3328-
PyModule_AddObject(m, "SHRT_MIN", PyLong_FromLong(SHRT_MIN));
3329-
PyModule_AddObject(m, "USHRT_MAX", PyLong_FromLong(USHRT_MAX));
3330-
PyModule_AddObject(m, "INT_MAX", PyLong_FromLong(INT_MAX));
3331-
PyModule_AddObject(m, "INT_MIN", PyLong_FromLong(INT_MIN));
3332-
PyModule_AddObject(m, "UINT_MAX", PyLong_FromUnsignedLong(UINT_MAX));
3333-
PyModule_AddObject(m, "LONG_MAX", PyLong_FromLong(LONG_MAX));
3334-
PyModule_AddObject(m, "LONG_MIN", PyLong_FromLong(LONG_MIN));
3335-
PyModule_AddObject(m, "ULONG_MAX", PyLong_FromUnsignedLong(ULONG_MAX));
3336-
PyModule_AddObject(m, "FLT_MAX", PyFloat_FromDouble(FLT_MAX));
3337-
PyModule_AddObject(m, "FLT_MIN", PyFloat_FromDouble(FLT_MIN));
3338-
PyModule_AddObject(m, "DBL_MAX", PyFloat_FromDouble(DBL_MAX));
3339-
PyModule_AddObject(m, "DBL_MIN", PyFloat_FromDouble(DBL_MIN));
3340-
PyModule_AddObject(m, "LLONG_MAX", PyLong_FromLongLong(LLONG_MAX));
3341-
PyModule_AddObject(m, "LLONG_MIN", PyLong_FromLongLong(LLONG_MIN));
3342-
PyModule_AddObject(m, "ULLONG_MAX", PyLong_FromUnsignedLongLong(ULLONG_MAX));
3343-
PyModule_AddObject(m, "PY_SSIZE_T_MAX", PyLong_FromSsize_t(PY_SSIZE_T_MAX));
3344-
PyModule_AddObject(m, "PY_SSIZE_T_MIN", PyLong_FromSsize_t(PY_SSIZE_T_MIN));
3345-
PyModule_AddObject(m, "SIZE_MAX", PyLong_FromSize_t(SIZE_MAX));
3346-
PyModule_AddObject(m, "SIZEOF_WCHAR_T", PyLong_FromSsize_t(sizeof(wchar_t)));
3347-
PyModule_AddObject(m, "SIZEOF_VOID_P", PyLong_FromSsize_t(sizeof(void*)));
3348-
PyModule_AddObject(m, "SIZEOF_TIME_T", PyLong_FromSsize_t(sizeof(time_t)));
3349-
PyModule_AddObject(m, "SIZEOF_PID_T", PyLong_FromSsize_t(sizeof(pid_t)));
3350-
PyModule_AddObject(m, "Py_Version", PyLong_FromUnsignedLong(Py_Version));
3324+
PyModule_Add(m, "CHAR_MAX", PyLong_FromLong(CHAR_MAX));
3325+
PyModule_Add(m, "CHAR_MIN", PyLong_FromLong(CHAR_MIN));
3326+
PyModule_Add(m, "UCHAR_MAX", PyLong_FromLong(UCHAR_MAX));
3327+
PyModule_Add(m, "SHRT_MAX", PyLong_FromLong(SHRT_MAX));
3328+
PyModule_Add(m, "SHRT_MIN", PyLong_FromLong(SHRT_MIN));
3329+
PyModule_Add(m, "USHRT_MAX", PyLong_FromLong(USHRT_MAX));
3330+
PyModule_Add(m, "INT_MAX", PyLong_FromLong(INT_MAX));
3331+
PyModule_Add(m, "INT_MIN", PyLong_FromLong(INT_MIN));
3332+
PyModule_Add(m, "UINT_MAX", PyLong_FromUnsignedLong(UINT_MAX));
3333+
PyModule_Add(m, "LONG_MAX", PyLong_FromLong(LONG_MAX));
3334+
PyModule_Add(m, "LONG_MIN", PyLong_FromLong(LONG_MIN));
3335+
PyModule_Add(m, "ULONG_MAX", PyLong_FromUnsignedLong(ULONG_MAX));
3336+
PyModule_Add(m, "FLT_MAX", PyFloat_FromDouble(FLT_MAX));
3337+
PyModule_Add(m, "FLT_MIN", PyFloat_FromDouble(FLT_MIN));
3338+
PyModule_Add(m, "DBL_MAX", PyFloat_FromDouble(DBL_MAX));
3339+
PyModule_Add(m, "DBL_MIN", PyFloat_FromDouble(DBL_MIN));
3340+
PyModule_Add(m, "LLONG_MAX", PyLong_FromLongLong(LLONG_MAX));
3341+
PyModule_Add(m, "LLONG_MIN", PyLong_FromLongLong(LLONG_MIN));
3342+
PyModule_Add(m, "ULLONG_MAX", PyLong_FromUnsignedLongLong(ULLONG_MAX));
3343+
PyModule_Add(m, "PY_SSIZE_T_MAX", PyLong_FromSsize_t(PY_SSIZE_T_MAX));
3344+
PyModule_Add(m, "PY_SSIZE_T_MIN", PyLong_FromSsize_t(PY_SSIZE_T_MIN));
3345+
PyModule_Add(m, "SIZE_MAX", PyLong_FromSize_t(SIZE_MAX));
3346+
PyModule_Add(m, "SIZEOF_WCHAR_T", PyLong_FromSsize_t(sizeof(wchar_t)));
3347+
PyModule_Add(m, "SIZEOF_VOID_P", PyLong_FromSsize_t(sizeof(void*)));
3348+
PyModule_Add(m, "SIZEOF_TIME_T", PyLong_FromSsize_t(sizeof(time_t)));
3349+
PyModule_Add(m, "SIZEOF_PID_T", PyLong_FromSsize_t(sizeof(pid_t)));
3350+
PyModule_Add(m, "Py_Version", PyLong_FromUnsignedLong(Py_Version));
33513351
Py_INCREF(&PyInstanceMethod_Type);
33523352
PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type);
33533353

33543354
PyModule_AddIntConstant(m, "the_number_three", 3);
3355-
PyModule_AddObject(m, "INT32_MIN", PyLong_FromInt32(INT32_MIN));
3356-
PyModule_AddObject(m, "INT32_MAX", PyLong_FromInt32(INT32_MAX));
3357-
PyModule_AddObject(m, "UINT32_MAX", PyLong_FromUInt32(UINT32_MAX));
3358-
PyModule_AddObject(m, "INT64_MIN", PyLong_FromInt64(INT64_MIN));
3359-
PyModule_AddObject(m, "INT64_MAX", PyLong_FromInt64(INT64_MAX));
3360-
PyModule_AddObject(m, "UINT64_MAX", PyLong_FromUInt64(UINT64_MAX));
3355+
PyModule_Add(m, "INT32_MIN", PyLong_FromInt32(INT32_MIN));
3356+
PyModule_Add(m, "INT32_MAX", PyLong_FromInt32(INT32_MAX));
3357+
PyModule_Add(m, "UINT32_MAX", PyLong_FromUInt32(UINT32_MAX));
3358+
PyModule_Add(m, "INT64_MIN", PyLong_FromInt64(INT64_MIN));
3359+
PyModule_Add(m, "INT64_MAX", PyLong_FromInt64(INT64_MAX));
3360+
PyModule_Add(m, "UINT64_MAX", PyLong_FromUInt64(UINT64_MAX));
33613361

33623362
#ifdef HAVE_PPOLL
33633363
if (PyModule_AddObjectRef(m, "HAVE_PPOLL", Py_True) < 0) {

‎Modules/main.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ pymain_run_interactive_hook(int *exitcode)
506506
}
507507

508508
if (PySys_Audit("cpython.run_interactivehook", "O", hook) < 0) {
509+
Py_DECREF(hook);
509510
goto error;
510511
}
511512

‎Python/crossinterp.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ check_missing___main___attr(PyObject *exc)
609609
// Get the error message.
610610
PyObject *args = PyException_GetArgs(exc);
611611
if (args == NULL || args == Py_None || PyObject_Size(args) < 1) {
612+
Py_XDECREF(args);
612613
assert(!PyErr_Occurred());
613614
return 0;
614615
}

‎Python/import.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5638,6 +5638,7 @@ _imp__set_lazy_attributes_impl(PyObject *module, PyObject *modobj,
56385638

56395639
module_dict = get_mod_dict(modobj);
56405640
if (module_dict == NULL || !PyDict_CheckExact(module_dict)) {
5641+
Py_DECREF(lazy_submodules);
56415642
goto done;
56425643
}
56435644

‎Python/pythonrun.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ _PyErr_Display(PyObject *file, PyObject *unused, PyObject *value, PyObject *tb)
11451145
"traceback",
11461146
"_print_exception_bltin");
11471147
if (print_exception_fn == NULL || !PyCallable_Check(print_exception_fn)) {
1148+
Py_XDECREF(print_exception_fn);
11481149
goto fallback;
11491150
}
11501151

‎Python/sysmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ sys_getwindowsversion_impl(PyObject *module)
17621762
PyObject *realVersion = _sys_getwindowsversion_from_kernel32();
17631763
if (!realVersion) {
17641764
if (!PyErr_ExceptionMatches(PyExc_WindowsError)) {
1765-
return NULL;
1765+
goto error;
17661766
}
17671767

17681768
PyErr_Clear();

0 commit comments

Comments
 (0)