gh-95808: Add missing early returns in _asynciomodule.c (#95809)

1st1 · web-flow · commit b2afe482f21b · 2022-08-15T16:32:40.000-07:00
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -631,15 +631,16 @@ create_cancelled_error(FutureObj *fut)
     } else {
         exc = PyObject_CallOneArg(asyncio_CancelledError, msg);
     }
-    PyException_SetContext(exc, fut->fut_cancelled_exc);
-    Py_CLEAR(fut->fut_cancelled_exc);
     return exc;
 }
 
 static void
 future_set_cancelled_error(FutureObj *fut)
 {
     PyObject *exc = create_cancelled_error(fut);
+    if (exc == NULL) {
+        return;
+    }
     PyErr_SetObject(asyncio_CancelledError, exc);
     Py_DECREF(exc);
 }

Original file line number	Diff line number	Diff line change
`@@ -631,15 +631,16 @@ create_cancelled_error(FutureObj *fut)`
`631`	`631`	`} else {`
`632`	`632`	`exc = PyObject_CallOneArg(asyncio_CancelledError, msg);`
`633`	`633`	`}`
`634`		`- PyException_SetContext(exc, fut->fut_cancelled_exc);`
`635`		`- Py_CLEAR(fut->fut_cancelled_exc);`
`636`	`634`	`return exc;`
`637`	`635`	`}`
`638`	`636`
`639`	`637`	`static void`
`640`	`638`	`future_set_cancelled_error(FutureObj *fut)`
`641`	`639`	`{`
`642`	`640`	`PyObject *exc = create_cancelled_error(fut);`
	`641`	`+ if (exc == NULL) {`
	`642`	`+ return;`
	`643`	`+ }`
`643`	`644`	`PyErr_SetObject(asyncio_CancelledError, exc);`
`644`	`645`	`Py_DECREF(exc);`
`645`	`646`	`}`