Fix refleaks in PyErr_SetHandledException (GH-91627)

sweeneyde · web-flow · commit 328920971601 · 2022-04-17T02:52:53.000-04:00
diff --git a/Python/errors.c b/Python/errors.c
@@ -520,9 +520,7 @@ PyErr_GetHandledException(void)
 void
 _PyErr_SetHandledException(PyThreadState *tstate, PyObject *exc)
 {
-    PyObject *oldexc = tstate->exc_info->exc_value;
-    tstate->exc_info->exc_value = Py_XNewRef(exc);
-    Py_XDECREF(oldexc);
+    Py_XSETREF(tstate->exc_info->exc_value, Py_XNewRef(exc));
 }
 
 void
@@ -543,6 +541,7 @@ void
 PyErr_SetExcInfo(PyObject *type, PyObject *value, PyObject *traceback)
 {
     PyErr_SetHandledException(value);
+    Py_XDECREF(value);
     /* These args are no longer used, but we still need to steal a ref */
     Py_XDECREF(type);
     Py_XDECREF(traceback);

Original file line number	Diff line number	Diff line change
`@@ -520,9 +520,7 @@ PyErr_GetHandledException(void)`
`520`	`520`	`void`
`521`	`521`	`_PyErr_SetHandledException(PyThreadState tstate, PyObject exc)`
`522`	`522`	`{`
`523`		`- PyObject *oldexc = tstate->exc_info->exc_value;`
`524`		`- tstate->exc_info->exc_value = Py_XNewRef(exc);`
`525`		`- Py_XDECREF(oldexc);`
	`523`	`+ Py_XSETREF(tstate->exc_info->exc_value, Py_XNewRef(exc));`
`526`	`524`	`}`
`527`	`525`
`528`	`526`	`void`
`@@ -543,6 +541,7 @@ void`
`543`	`541`	`PyErr_SetExcInfo(PyObject type, PyObject value, PyObject *traceback)`
`544`	`542`	`{`
`545`	`543`	`PyErr_SetHandledException(value);`
	`544`	`+ Py_XDECREF(value);`
`546`	`545`	`/* These args are no longer used, but we still need to steal a ref */`
`547`	`546`	`Py_XDECREF(type);`
`548`	`547`	`Py_XDECREF(traceback);`