Merge branch 'main' into fix-imap-buffersize-close

Author: oyiakoumis

Lib/asyncio/base_events.py

@@ -1244,6 +1244,7 @@ async def _create_connection_transport(
             await waiter
         except:
             transport.close()
+            waiter = None
             raise
 
         return transport, protocol
@@ -1381,6 +1382,7 @@ async def start_tls(self, transport, protocol, sslcontext, *,
             transport.close()
             conmade_cb.cancel()
             resume_cb.cancel()
+            waiter = None
             raise
 
         return ssl_protocol._app_transport

Lib/asyncio/selector_events.py

@@ -1225,6 +1225,7 @@ def _call_connection_lost(self, exc):
             super()._call_connection_lost(exc)
         finally:
             self._write_ready = None
+            self._read_ready_cb = None
             if self._empty_waiter is not None:
                 self._empty_waiter.set_exception(
                     ConnectionError("Connection is closed by peer"))

Lib/asyncio/windows_events.py

@@ -515,11 +515,11 @@ def recvfrom(self, conn, nbytes, flags=0):
         return self._register(ov, conn, partial(self._finish_recvfrom,
                                                 empty_result=b''))
 
-    def recvfrom_into(self, conn, buf, flags=0):
+    def recvfrom_into(self, conn, buf, nbytes=0):
         self._register_with_iocp(conn)
         ov = _overlapped.Overlapped(NULL)
         try:
-            ov.WSARecvFromInto(conn.fileno(), buf, flags)
+            ov.WSARecvFromInto(conn.fileno(), buf, nbytes)
         except BrokenPipeError:
             return self._result((0, None))
 

Lib/test/test_asyncio/test_sslproto.py

@@ -832,6 +832,68 @@ async def client(addr):
         self.assertIsInstance(server_err, ssl.SSLError)
         self.assertIn('ALERT_UNKNOWN_CA', server_err.reason or '')
 
+    def test_create_connection_ssl_failed_certificate_no_cycles(self):
+        # gh-159049
+        sslctx = test_utils.simple_server_sslcontext()
+        client_sslctx = test_utils.simple_client_sslcontext(
+            disable_verify=False)
+        transports = []
+
+        def server(sock):
+            try:
+                sock.start_tls(sslctx, server_side=True)
+            except OSError:
+                pass
+
+        connection_made = sslproto.SSLProtocol.connection_made
+
+        def remember_transport(proto, tr):
+            transports.append(weakref.ref(tr))
+            connection_made(proto, tr)
+
+        async def conn(addr):
+            try:
+                await self.loop.create_connection(
+                    asyncio.Protocol, *addr,
+                    ssl=client_sslctx, server_hostname='')
+            except ssl.SSLCertVerificationError:
+                pass
+
+        support.gc_collect()
+        with (self.tcp_server(server) as srv, support.disable_gc(),
+              mock.patch.object(sslproto.SSLProtocol, 'connection_made',
+                                remember_transport)):
+            self.loop.run_until_complete(conn(srv.addr))
+            self.assertEqual([tr() for tr in transports], [None])
+
+    def test_start_tls_failed_certificate_no_cycles(self):
+        # gh-159049
+        sslctx = test_utils.simple_server_sslcontext()
+        client_sslctx = test_utils.simple_client_sslcontext(
+            disable_verify=False)
+        transports = []
+
+        def server(sock):
+            try:
+                sock.start_tls(sslctx, server_side=True)
+            except OSError:
+                pass
+
+        async def client(addr):
+            tr, proto = await self.loop.create_connection(
+                asyncio.Protocol, *addr)
+            transports.append(weakref.ref(tr))
+            try:
+                await self.loop.start_tls(
+                    tr, proto, client_sslctx, server_hostname='')
+            except ssl.SSLCertVerificationError:
+                pass
+
+        support.gc_collect()
+        with self.tcp_server(server) as srv, support.disable_gc():
+            self.loop.run_until_complete(client(srv.addr))
+            self.assertEqual([tr() for tr in transports], [None])
+
     def test_create_server_ssl_failed_handshake_sends_alert(self):
         # gh-98078: when the handshake fails, the server must send the
         # fatal TLS alert generated by OpenSSL to the client before

Lib/test/test_asyncio/test_tasks.py

@@ -1,5 +1,6 @@
 """Tests for tasks.py."""
 
+import _thread
 import collections
 import contextlib
 import contextvars
@@ -20,6 +21,7 @@
 from asyncio import tasks
 from test.test_asyncio import utils as test_utils
 from test import support
+from test.support import threading_helper
 from test.support.script_helper import assert_python_ok
 
 
@@ -3095,6 +3097,39 @@ class CTask_CFuture_Tests(BaseTaskTests, SetMethodsTest,
     all_tasks = getattr(tasks, '_c_all_tasks', None)
     current_task = staticmethod(getattr(tasks, '_c_current_task', None))
 
+    @threading_helper.requires_working_threading()
+    def test_task_created_during_thread_state_clear(self):
+        loop = self.loop
+        task = None
+        var = contextvars.ContextVar('var')
+        # Avoid recreating the thread state's context after it is cleared.
+        task_context = contextvars.Context()
+
+        async def noop():
+            pass
+
+        class CreatesTaskOnClear:
+            def __del__(self):
+                nonlocal task
+                task = loop.create_task(noop(), context=task_context)
+
+        def create_finalizer():
+            # gh-159041: Run the finalizer when PyThreadState_Clear()
+            # clears the thread's context.
+            var.set(CreatesTaskOnClear())
+
+        # threading.Thread owns its Context, so use _thread to make the
+        # Context lifetime match the thread state's lifetime.
+        handle = _thread.start_joinable_thread(create_finalizer)
+        handle.join(support.SHORT_TIMEOUT)
+        self.assertTrue(handle.is_done(), 'thread failed to exit')
+        self.assertIsNotNone(task)
+
+        try:
+            self.assertEqual(self.all_tasks(loop), {task})
+        finally:
+            loop.run_until_complete(task)
+
     def test_del__log_destroy_pending_segfault(self):
         async def coro():
             pass

Lib/test/test_compile.py

@@ -1583,6 +1583,28 @@ def f():
 
         self.check_line_numbers(f.__code__, 'JUMP_BACKWARD')
 
+    def test_backward_jump_conditional_in_loop_in_try(self):
+        # gh-130279: The jumps in a loop body, including the backward jump
+        # for the untaken branch of a conditional at the end of the body,
+        # must be covered by the exception handler of the enclosing try.
+        def f(items):
+            try:
+                for x in items:
+                    if x < 0:
+                        raise ValueError(x)
+            except KeyboardInterrupt:
+                return 'handled'
+
+        bytecode = dis.Bytecode(f)
+        jumps = [instr for instr in bytecode
+                 if instr.opcode in dis.hasjump]
+        self.assertTrue(jumps)
+        for instr in jumps:
+            with self.subTest(instr=instr):
+                self.assertTrue(
+                    any(entry.start <= instr.offset < entry.end
+                        for entry in bytecode.exception_entries))
+
     def test_big_dict_literal(self):
         # The compiler has a flushing point in "compiler_dict" that calls compiles
         # a portion of the dictionary literal when the loop that iterates over the items

Lib/test/test_dis.py

@@ -454,53 +454,52 @@ def foo(a: int, b: str) -> str:
 """
 
 dis_traceback = """\
-%4d            RESUME                   0
+%4d           RESUME                   0
 
-%4d            NOP
+%4d           NOP
 
-%4d    L1:     LOAD_SMALL_INT           1
-                LOAD_SMALL_INT           0
-            --> BINARY_OP               11 (/)
-                POP_TOP
+%4d   L1:     LOAD_SMALL_INT           1
+               LOAD_SMALL_INT           0
+           --> BINARY_OP               11 (/)
+               POP_TOP
 
-%4d    L2:     LOAD_FAST_CHECK          1 (tb)
-                RETURN_VALUE
+%4d   L2:     LOAD_FAST_CHECK          1 (tb)
+               RETURN_VALUE
 
-  --    L3:     PUSH_EXC_INFO
+  --   L3:     PUSH_EXC_INFO
 
-%4d            LOAD_GLOBAL              0 (Exception)
-                CHECK_EXC_MATCH
-                POP_JUMP_IF_FALSE       24 (to L9)
-        L4:     NOT_TAKEN
-        L5:     STORE_FAST               0 (e)
+%4d           LOAD_GLOBAL              0 (Exception)
+               CHECK_EXC_MATCH
+               POP_JUMP_IF_FALSE       24 (to L7)
+               NOT_TAKEN
+               STORE_FAST               0 (e)
 
-%4d    L6:     LOAD_FAST                0 (e)
-                LOAD_ATTR                2 (__traceback__)
-                STORE_FAST               1 (tb)
-        L7:     POP_EXCEPT
-                LOAD_COMMON_CONSTANT     7 (None)
-                STORE_FAST               0 (e)
-                DELETE_FAST              0 (e)
+%4d   L4:     LOAD_FAST                0 (e)
+               LOAD_ATTR                2 (__traceback__)
+               STORE_FAST               1 (tb)
+       L5:     POP_EXCEPT
+               LOAD_COMMON_CONSTANT     7 (None)
+               STORE_FAST               0 (e)
+               DELETE_FAST              0 (e)
 
-%4d            LOAD_FAST                1 (tb)
-                RETURN_VALUE
+%4d           LOAD_FAST                1 (tb)
+               RETURN_VALUE
 
-  --    L8:     LOAD_COMMON_CONSTANT     7 (None)
-                STORE_FAST               0 (e)
-                DELETE_FAST              0 (e)
-                RERAISE                  1
+  --   L6:     LOAD_COMMON_CONSTANT     7 (None)
+               STORE_FAST               0 (e)
+               DELETE_FAST              0 (e)
+               RERAISE                  1
 
-%4d    L9:     RERAISE                  0
+%4d   L7:     RERAISE                  0
 
-  --   L10:     COPY                     3
-                POP_EXCEPT
-                RERAISE                  1
+  --   L8:     COPY                     3
+               POP_EXCEPT
+               RERAISE                  1
 ExceptionTable:
   L1 to L2 -> L3 [0]
-  L3 to L4 -> L10 [1] lasti
-  L5 to L6 -> L10 [1] lasti
-  L6 to L7 -> L8 [1] lasti
-  L8 to L10 -> L10 [1] lasti
+  L3 to L4 -> L8 [1] lasti
+  L4 to L5 -> L6 [1] lasti
+  L6 to L8 -> L8 [1] lasti
 """ % (TRACEBACK_CODE.co_firstlineno,
        TRACEBACK_CODE.co_firstlineno + 1,
        TRACEBACK_CODE.co_firstlineno + 2,
@@ -569,11 +568,11 @@ def _with(c):
 %4d   L3:     PUSH_EXC_INFO
                WITH_EXCEPT_START
                TO_BOOL
-               POP_JUMP_IF_TRUE         2 (to L6)
-       L4:     NOT_TAKEN
-       L5:     RERAISE                  2
-       L6:     POP_TOP
-       L7:     POP_EXCEPT
+               POP_JUMP_IF_TRUE         2 (to L4)
+               NOT_TAKEN
+               RERAISE                  2
+       L4:     POP_TOP
+       L5:     POP_EXCEPT
                POP_TOP
                POP_TOP
                POP_TOP
@@ -583,13 +582,12 @@ def _with(c):
                LOAD_COMMON_CONSTANT     7 (None)
                RETURN_VALUE
 
-  --   L8:     COPY                     3
+  --   L6:     COPY                     3
                POP_EXCEPT
                RERAISE                  1
 ExceptionTable:
   L1 to L2 -> L3 [2] lasti
-  L3 to L4 -> L8 [4] lasti
-  L5 to L7 -> L8 [4] lasti
+  L3 to L5 -> L6 [4] lasti
 """ % (_with.__code__.co_firstlineno,
        _with.__code__.co_firstlineno + 1,
        _with.__code__.co_firstlineno + 2,
@@ -664,11 +662,11 @@ async def _asyncwith(c):
        L20:     CLEANUP_THROW
        L21:     END_SEND
                 TO_BOOL
-                POP_JUMP_IF_TRUE         2 (to L24)
-       L22:     NOT_TAKEN
-       L23:     RERAISE                  2
-       L24:     POP_TOP
-       L25:     POP_EXCEPT
+                POP_JUMP_IF_TRUE         2 (to L22)
+                NOT_TAKEN
+                RERAISE                  2
+       L22:     POP_TOP
+       L23:     POP_EXCEPT
                 POP_TOP
                 POP_TOP
                 POP_TOP
@@ -678,25 +676,24 @@ async def _asyncwith(c):
                 LOAD_COMMON_CONSTANT     7 (None)
                 RETURN_VALUE
 
-  --   L26:     COPY                     3
+  --   L24:     COPY                     3
                 POP_EXCEPT
                 RERAISE                  1
-       L27:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
+       L25:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
                 RERAISE                  1
 ExceptionTable:
-  L1 to L3 -> L27 [0] lasti
+  L1 to L3 -> L25 [0] lasti
   L3 to L4 -> L12 [5]
-  L4 to L6 -> L27 [0] lasti
+  L4 to L6 -> L25 [0] lasti
   L6 to L7 -> L16 [2] lasti
-  L7 to L9 -> L27 [0] lasti
+  L7 to L9 -> L25 [0] lasti
   L9 to L10 -> L14 [3]
-  L10 to L13 -> L27 [0] lasti
-  L14 to L15 -> L27 [0] lasti
-  L16 to L18 -> L26 [4] lasti
+  L10 to L13 -> L25 [0] lasti
+  L14 to L15 -> L25 [0] lasti
+  L16 to L18 -> L24 [4] lasti
   L18 to L19 -> L20 [8]
-  L19 to L22 -> L26 [4] lasti
-  L23 to L25 -> L26 [4] lasti
-  L25 to L27 -> L27 [0] lasti
+  L19 to L23 -> L24 [4] lasti
+  L23 to L25 -> L25 [0] lasti
 """ % (_asyncwith.__code__.co_firstlineno,
        _asyncwith.__code__.co_firstlineno + 1,
        _asyncwith.__code__.co_firstlineno + 2,