[3.11] gh-109534: fix reference leak when SSL handshake fails (GH-114074) (#114830)

miss-islington · ordinary-jamie · web-flow · commit ef2ba9a00757 · 2024-02-01T00:59:17.000Z
gh-109534: fix reference leak when SSL handshake fails (GH-114074) (cherry picked from commit 80aa7b3) Co-authored-by: Jamie Phan <jamie@ordinarylab.dev>
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
@@ -222,6 +222,10 @@ async def _accept_connection2(
                 await waiter
             except BaseException:
                 transport.close()
+                # gh-109534: When an exception is raised by the SSLProtocol object the
+                # exception set in this future can keep the protocol object alive and
+                # cause a reference cycle.
+                waiter = None
                 raise
                 # It's now up to the protocol to handle the connection.
 
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
@@ -579,6 +579,7 @@ def _on_handshake_complete(self, handshake_exc):
 
             peercert = sslobj.getpeercert()
         except Exception as exc:
+            handshake_exc = None
             self._set_state(SSLProtocolState.UNWRAPPED)
             if isinstance(exc, ssl.CertificateError):
                 msg = 'SSL handshake failed on verifying the certificate'
diff --git a/Misc/NEWS.d/next/Library/2024-01-15-18-42-44.gh-issue-109534.wYaLMZ.rst b/Misc/NEWS.d/next/Library/2024-01-15-18-42-44.gh-issue-109534.wYaLMZ.rst
@@ -0,0 +1,3 @@
+Fix a reference leak in
+:class:`asyncio.selector_events.BaseSelectorEventLoop` when SSL handshakes
+fail. Patch contributed by Jamie Phan.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Fix a reference leak in`
	`2`	+:class:`asyncio.selector_events.BaseSelectorEventLoop` when SSL handshakes
	`3`	`+fail. Patch contributed by Jamie Phan.`