From b8a102d26f41e57b94359627a4df8f22af10c6fa Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 2 Mar 2016 15:36:02 +0000
Subject: Handle wcwidth() and mbtowc() failures in better style and drop
 characters where we can't find the width (wcwidth() fails) on input, the same
 as we drop invalid UTF-8. Suggested by schwarze@.

---
 tty-keys.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tty-keys.c')

diff --git a/tty-keys.c b/tty-keys.c
index 2b998778..105f99f7 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -477,6 +477,7 @@ tty_keys_next(struct tty *tty)
 	struct utf8_data	 ud;
 	enum utf8_state		 more;
 	u_int			 i;
+	wchar_t			 wc;
 
 	/* Get key buffer. */
 	buf = EVBUFFER_DATA(tty->event->input);
@@ -552,7 +553,11 @@ first_key:
 			more = utf8_append(&ud, (u_char)buf[i]);
 		if (more != UTF8_DONE)
 			goto discard_key;
-		key = utf8_combine(&ud);
+
+		if (utf8_combine(&ud, &wc) != UTF8_DONE)
+			goto discard_key;
+		key = wc;
+
 		log_debug("UTF-8 key %.*s %#llx", (int)size, buf, key);
 		goto complete_key;
 	}
-- 
cgit