From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 23 Aug 2023 10:10:14 +0000 (-0700)
Subject: [3.10] gh-108342: Break ref cycle in SSLSocket._create() exc (GH-108344) (#108350)
X-Git-Tag: v3.10.13~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=893c3b7f5c52b5c0800b72a78fb799632efcd628;p=thirdparty%2FPython%2Fcpython.git

[3.10] gh-108342: Break ref cycle in SSLSocket._create() exc (GH-108344) (#108350)

Explicitly break a reference cycle when SSLSocket._create() raises an
exception. Clear the variable storing the exception, since the
exception traceback contains the variables and so creates a reference
cycle.

This test leak was introduced by the test added for the fix of GH-108310.
(cherry picked from commit 64f99350351bc46e016b2286f36ba7cd669b79e3)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/ssl.py b/Lib/ssl.py
index fadbee217afd..f386fa783152 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -1079,7 +1079,11 @@ class SSLSocket(socket):
                     self.close()
                 except OSError:
                     pass
-                raise notconn_pre_handshake_data_error
+                try:
+                    raise notconn_pre_handshake_data_error
+                finally:
+                    # Explicitly break the reference cycle.
+                    notconn_pre_handshake_data_error = None
         else:
             connected = True