[3.14] gh-154275: Fix cleanup code in _Py_make_parameters (GH-154341) (#154343)

miss-islington · sobolevn · web-flow · commit e1eb9e882edf · 2026-07-21T10:53:06.000Z
gh-154275: Fix cleanup code in `_Py_make_parameters` (GH-154341) (cherry picked from commit 196e16d) Co-authored-by: sobolevn <mail@sobolevn.me>
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
@@ -195,15 +195,14 @@ _Py_make_parameters(PyObject *args)
     if (is_args_list) {
         args = tuple_args = PySequence_Tuple(args);
         if (args == NULL) {
-            return NULL;
+            goto cleanup;
         }
     }
     Py_ssize_t nargs = PyTuple_GET_SIZE(args);
     Py_ssize_t len = nargs;
     PyObject *parameters = PyTuple_New(len);
     if (parameters == NULL) {
-        Py_XDECREF(tuple_args);
-        return NULL;
+        goto error;
     }
     Py_ssize_t iparam = 0;
     for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) {

Original file line number	Diff line number	Diff line change
`@@ -195,15 +195,14 @@ _Py_make_parameters(PyObject *args)`
`195`	`195`	`if (is_args_list) {`
`196`	`196`	`args = tuple_args = PySequence_Tuple(args);`
`197`	`197`	`if (args == NULL) {`
`198`		`- return NULL;`
	`198`	`+ goto cleanup;`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`Py_ssize_t nargs = PyTuple_GET_SIZE(args);`
`202`	`202`	`Py_ssize_t len = nargs;`
`203`	`203`	`PyObject *parameters = PyTuple_New(len);`
`204`	`204`	`if (parameters == NULL) {`
`205`		`- Py_XDECREF(tuple_args);`
`206`		`- return NULL;`
	`205`	`+ goto error;`
`207`	`206`	`}`
`208`	`207`	`Py_ssize_t iparam = 0;`
`209`	`208`	`for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) {`