2 files changed, 21 insertions, 20 deletions

diff --git a/win32/termios.c b/win32/termios.c
index 7d6adaafe..f18ff7c3b 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -34,10 +34,6 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
         INPUT_RECORD record;
         DWORD nevent_out, mode;
         int ret = -1;
-#if !ENABLE_FEATURE_UTF8_INPUT
-        wchar_t uchar;
-        char achar;
-#endif
         DWORD alt_pressed = FALSE;
         DWORD state;
 
@@ -54,11 +50,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                         if (WaitForSingleObject(cin, timeout) != WAIT_OBJECT_0)
                                 goto done;
                 }
-#if !ENABLE_FEATURE_UTF8_INPUT
-                if (!ReadConsoleInputW(cin, &record, 1, &nevent_out))
-#else
                 if (!readConsoleInput_utf8(cin, &record, 1, &nevent_out))
-#endif
                         goto done;
 
                 if (record.EventType != KEY_EVENT)
@@ -73,11 +65,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                 }
                 alt_pressed = state & LEFT_ALT_PRESSED;
 
-#if !ENABLE_FEATURE_UTF8_INPUT
-                if (!record.Event.KeyEvent.uChar.UnicodeChar) {
-#else
                 if (!record.Event.KeyEvent.uChar.AsciiChar) {
-#endif
                         if (alt_pressed && !(state & ENHANCED_KEY)) {
                                 /* keys on numeric pad used to enter character codes */
                                 switch (record.Event.KeyEvent.wVirtualKeyCode) {
@@ -119,19 +107,11 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                                 ret &= ~0x80;
                         goto done;
                 }
-#if !ENABLE_FEATURE_UTF8_INPUT
-                uchar = record.Event.KeyEvent.uChar.UnicodeChar;
-                achar = uchar & 0x7f;
-                if (achar != uchar)
-                        WideCharToMultiByte(CP_ACP, 0, &uchar, 1, &achar, 1, NULL, NULL);
-                ret = achar;
-#else
                 if ( (record.Event.KeyEvent.uChar.AsciiChar & 0x80) == 0x80 ) {
                         char *s = &record.Event.KeyEvent.uChar.AsciiChar;
                         conToCharBuffA(s, 1);
                 }
                 ret = record.Event.KeyEvent.uChar.AsciiChar;
-#endif
                 if (state & (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED)) {
                         switch (ret) {
                         case '\b': ret = KEYCODE_ALT_BACKSPACE; goto done;
diff --git a/win32/winansi.c b/win32/winansi.c
index 479e5ca40..5a6c33350 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -1348,4 +1348,25 @@ BOOL readConsoleInput_utf8(HANDLE h, INPUT_RECORD *r, DWORD len, DWORD *got)
         *got = 1;
         return TRUE;
 }
+#else
+/*
+ * In Windows 10 and 11 using ReadConsoleInputA() with a console input
+ * code page of CP_UTF8 can crash the console/terminal.  Avoid this by
+ * using ReadConsoleInputW() in that case.
+ */
+BOOL readConsoleInput_utf8(HANDLE h, INPUT_RECORD *r, DWORD len, DWORD *got)
+{
+        if (GetConsoleCP() != CP_UTF8)
+                return ReadConsoleInput(h, r, len, got);
+
+        if (ReadConsoleInputW(h, r, len, got)) {
+                wchar_t uchar = r->Event.KeyEvent.uChar.UnicodeChar;
+                char achar = uchar & 0x7f;
+                if (achar != uchar)
+                        achar = '?';
+                r->Event.KeyEvent.uChar.AsciiChar = achar;
+                return TRUE;
+        }
+        return FALSE;
+}
 #endif