gh-145376: Fix various refleaks in Objects/ (#145609)

eendebakpt · web-flow · commit 8060aa5d7dd0 · 2026-03-09T14:17:27.000+01:00
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -1112,11 +1112,13 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
         attr_old = getattrs(self->win);
         if (curses_wattrset(self, attr, "addstr") < 0) {
             curses_release_wstr(strtype, wstr);
+            Py_XDECREF(bytesobj);
             return NULL;
         }
     }
 #ifdef HAVE_NCURSESW
     if (strtype == 2) {
+        assert(bytesobj == NULL);
         if (use_xy) {
             rtn = mvwaddwstr(self->win,y,x,wstr);
             funcname = "mvwaddwstr";
@@ -1130,6 +1132,7 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,
     else
 #endif
     {
+        assert(wstr == NULL);
         const char *str = PyBytes_AS_STRING(bytesobj);
         if (use_xy) {
             rtn = mvwaddstr(self->win,y,x,str);
@@ -1210,6 +1213,7 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,
         attr_old = getattrs(self->win);
         if (curses_wattrset(self, attr, "addnstr") < 0) {
             curses_release_wstr(strtype, wstr);
+            Py_XDECREF(bytesobj);
             return NULL;
         }
     }
@@ -2212,6 +2216,7 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,
         attr_old = getattrs(self->win);
         if (curses_wattrset(self, attr, "insstr") < 0) {
             curses_release_wstr(strtype, wstr);
+            Py_XDECREF(bytesobj);
             return NULL;
         }
     }
diff --git a/Modules/binascii.c b/Modules/binascii.c
@@ -924,7 +924,7 @@ binascii_a2b_ascii85_impl(PyObject *module, Py_buffer *data, int foldspaces,
     }
     unsigned char *bin_data = PyBytesWriter_GetData(writer);
     if (bin_data == NULL) {
-        return NULL;
+        goto error;
     }
 
     uint32_t leftchar = 0;
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
@@ -299,6 +299,8 @@ subs_tvars(PyObject *obj, PyObject *params,
                                     &PyTuple_GET_ITEM(arg, 0),
                                     PyTuple_GET_SIZE(arg));
                     if (j < 0) {
+                        Py_DECREF(subparams);
+                        Py_DECREF(subargs);
                         return NULL;
                     }
                     continue;
@@ -455,6 +457,7 @@ _Py_subs_parameters(PyObject *self, PyObject *args, PyObject *parameters, PyObje
     if (is_args_list) {
         args = tuple_args = PySequence_Tuple(args);
         if (args == NULL) {
+            Py_DECREF(item);
             return NULL;
         }
     }
diff --git a/Objects/object.c b/Objects/object.c
@@ -1295,6 +1295,7 @@ _PyObject_SetAttributeErrorContext(PyObject* v, PyObject* name)
     // Augment the exception with the name and object
     if (PyObject_SetAttr(exc, &_Py_ID(name), name) ||
         PyObject_SetAttr(exc, &_Py_ID(obj), v)) {
+        Py_DECREF(exc);
         return 1;
     }
 restore:
@@ -3077,9 +3078,9 @@ Py_ReprEnter(PyObject *obj)
         list = PyList_New(0);
         if (list == NULL)
             return -1;
-        if (PyDict_SetItem(dict, &_Py_ID(Py_Repr), list) < 0)
+        if (_PyDict_SetItem_Take2((PyDictObject *)dict, &_Py_ID(Py_Repr), list) < 0) {
             return -1;
-        Py_DECREF(list);
+        }
     }
     i = PyList_GET_SIZE(list);
     while (--i >= 0) {
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -515,7 +515,8 @@ initialize_structseq_dict(PyStructSequence_Desc *desc, PyObject* dict,
     }
 
     if (_PyTuple_Resize(&keys, k) == -1) {
-        goto error;
+        assert(keys == NULL);
+        return -1;
     }
 
     if (PyDict_SetItemString(dict, match_args_key, keys) < 0) {
diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
@@ -2305,13 +2305,12 @@ generic_class_getitem(PyObject *cls, PyObject *args, PyObject *kwargs)
 PyObject *
 _Py_subscript_generic(PyThreadState* unused, PyObject *params)
 {
-    params = unpack_typevartuples(params);
-
     PyInterpreterState *interp = _PyInterpreterState_GET();
     if (interp->cached_objects.generic_type == NULL) {
         PyErr_SetString(PyExc_SystemError, "Cannot find Generic type");
         return NULL;
     }
+    params = unpack_typevartuples(params);
     PyObject *args[2] = {(PyObject *)interp->cached_objects.generic_type, params};
     PyObject *result = call_typing_func_object("_GenericAlias", args, 2);
     Py_DECREF(params);
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -5220,7 +5220,7 @@ unicode_decode_utf8_impl(_PyUnicodeWriter *writer,
             }
 
             if (_PyUnicodeWriter_Prepare(writer, end - s, 127) < 0) {
-                return -1;
+                goto onError;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1112,11 +1112,13 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,`
`1112`	`1112`	`attr_old = getattrs(self->win);`
`1113`	`1113`	`if (curses_wattrset(self, attr, "addstr") < 0) {`
`1114`	`1114`	`curses_release_wstr(strtype, wstr);`
	`1115`	`+ Py_XDECREF(bytesobj);`
`1115`	`1116`	`return NULL;`
`1116`	`1117`	`}`
`1117`	`1118`	`}`
`1118`	`1119`	`#ifdef HAVE_NCURSESW`
`1119`	`1120`	`if (strtype == 2) {`
	`1121`	`+ assert(bytesobj == NULL);`
`1120`	`1122`	`if (use_xy) {`
`1121`	`1123`	`rtn = mvwaddwstr(self->win,y,x,wstr);`
`1122`	`1124`	`funcname = "mvwaddwstr";`
`@@ -1130,6 +1132,7 @@ _curses_window_addstr_impl(PyCursesWindowObject *self, int group_left_1,`
`1130`	`1132`	`else`
`1131`	`1133`	`#endif`
`1132`	`1134`	`{`
	`1135`	`+ assert(wstr == NULL);`
`1133`	`1136`	`const char *str = PyBytes_AS_STRING(bytesobj);`
`1134`	`1137`	`if (use_xy) {`
`1135`	`1138`	`rtn = mvwaddstr(self->win,y,x,str);`
`@@ -1210,6 +1213,7 @@ _curses_window_addnstr_impl(PyCursesWindowObject *self, int group_left_1,`
`1210`	`1213`	`attr_old = getattrs(self->win);`
`1211`	`1214`	`if (curses_wattrset(self, attr, "addnstr") < 0) {`
`1212`	`1215`	`curses_release_wstr(strtype, wstr);`
	`1216`	`+ Py_XDECREF(bytesobj);`
`1213`	`1217`	`return NULL;`
`1214`	`1218`	`}`
`1215`	`1219`	`}`
`@@ -2212,6 +2216,7 @@ _curses_window_insstr_impl(PyCursesWindowObject *self, int group_left_1,`
`2212`	`2216`	`attr_old = getattrs(self->win);`
`2213`	`2217`	`if (curses_wattrset(self, attr, "insstr") < 0) {`
`2214`	`2218`	`curses_release_wstr(strtype, wstr);`
	`2219`	`+ Py_XDECREF(bytesobj);`
`2215`	`2220`	`return NULL;`
`2216`	`2221`	`}`
`2217`	`2222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,7 @@ binascii_a2b_ascii85_impl(PyObject module, Py_buffer data, int foldspaces,`
`924`	`924`	`}`
`925`	`925`	`unsigned char *bin_data = PyBytesWriter_GetData(writer);`
`926`	`926`	`if (bin_data == NULL) {`
`927`		`- return NULL;`
	`927`	`+ goto error;`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`uint32_t leftchar = 0;`
Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,8 @@ subs_tvars(PyObject obj, PyObject params,`
`299`	`299`	`&PyTuple_GET_ITEM(arg, 0),`
`300`	`300`	`PyTuple_GET_SIZE(arg));`
`301`	`301`	`if (j < 0) {`
	`302`	`+ Py_DECREF(subparams);`
	`303`	`+ Py_DECREF(subargs);`
`302`	`304`	`return NULL;`
`303`	`305`	`}`
`304`	`306`	`continue;`
`@@ -455,6 +457,7 @@ _Py_subs_parameters(PyObject self, PyObject args, PyObject *parameters, PyObje`
`455`	`457`	`if (is_args_list) {`
`456`	`458`	`args = tuple_args = PySequence_Tuple(args);`
`457`	`459`	`if (args == NULL) {`
	`460`	`+ Py_DECREF(item);`
`458`	`461`	`return NULL;`
`459`	`462`	`}`
`460`	`463`	`}`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,8 @@ initialize_structseq_dict(PyStructSequence_Desc desc, PyObject dict,`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`if (_PyTuple_Resize(&keys, k) == -1) {`
`518`		`- goto error;`
	`518`	`+ assert(keys == NULL);`
	`519`	`+ return -1;`
`519`	`520`	`}`
`520`	`521`
`521`	`522`	`if (PyDict_SetItemString(dict, match_args_key, keys) < 0) {`
Original file line number	Diff line number	Diff line change
`@@ -5220,7 +5220,7 @@ unicode_decode_utf8_impl(_PyUnicodeWriter *writer,`
`5220`	`5220`	`}`
`5221`	`5221`
`5222`	`5222`	`if (_PyUnicodeWriter_Prepare(writer, end - s, 127) < 0) {`
`5223`		`- return -1;`
	`5223`	`+ goto onError;`
`5224`	`5224`	`}`
`5225`	`5225`	`}`
`5226`	`5226`	`}`