From 7dfa24ee1ab93f9f05848302d7c3d5cd7e6ed7da Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Sun, 10 Nov 2024 20:38:02 +0100
Subject: [PATCH 1/2] Fix pyrepl crash for double ctrl-z in line overflow

---
 Lib/_pyrepl/utils.py                         |  2 +-
 Lib/test/test_pyrepl/test_windows_console.py | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Lib/_pyrepl/utils.py b/Lib/_pyrepl/utils.py
index 0f36083b6ffa92..4651717bd7e121 100644
--- a/Lib/_pyrepl/utils.py
+++ b/Lib/_pyrepl/utils.py
@@ -16,7 +16,7 @@ def str_width(c: str) -> int:
 
 
 def wlen(s: str) -> int:
-    if len(s) == 1:
+    if len(s) == 1 and s != '\x1a':
         return str_width(s)
     length = sum(str_width(i) for i in s)
     # remove lengths of any escape sequences
diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py
index 4a3b2baf64a944..07eaccd1124cd6 100644
--- a/Lib/test/test_pyrepl/test_windows_console.py
+++ b/Lib/test/test_pyrepl/test_windows_console.py
@@ -329,6 +329,20 @@ def move_right(self, cols=1):
     def erase_in_line(self):
         return ERASE_IN_LINE.encode("utf8")
 
+    def test_multiline_ctrl_z(self):
+        # see gh-126332
+        code = "abcdefghi"
+
+        events = itertools.chain(
+            code_to_events(code),
+            [
+                Event(evt="key", data='\x1a', raw=bytearray(b'\x1a')),
+                Event(evt="key", data='\x1a', raw=bytearray(b'\x1a')),
+            ],
+        )
+        reader, _ = self.handle_events_narrow(events)
+        self.assertEqual(reader.cxy, (2, 3))
+
 
 if __name__ == "__main__":
     unittest.main()

From 75e909e8c3d0810a4e35c3842852bee65926ac3b Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Sun, 10 Nov 2024 19:45:06 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Library/2024-11-10-19-45-01.gh-issue-126332.WCCKoH.rst  | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Library/2024-11-10-19-45-01.gh-issue-126332.WCCKoH.rst

diff --git a/Misc/NEWS.d/next/Library/2024-11-10-19-45-01.gh-issue-126332.WCCKoH.rst b/Misc/NEWS.d/next/Library/2024-11-10-19-45-01.gh-issue-126332.WCCKoH.rst
new file mode 100644
index 00000000000000..9277797ddc745e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-10-19-45-01.gh-issue-126332.WCCKoH.rst
@@ -0,0 +1 @@
+Fix _pyrepl crash when entering a double CTRL-Z on an overflowing line.