Be more strict about invalid UTF-8.

1 files changed, 4 insertions, 2 deletions

diff --git a/key-string.c b/key-string.c
index c2230218..81d014ac 100644
--- a/key-string.c
+++ b/key-string.c
@@ -144,7 +144,7 @@ key_string_lookup_string(const char *string)
 	static const char	*other = "!#()+,-.0123456789:;<=>?'\r\t";
 	key_code		 key;
 	u_short			 u;
-	int			 size;
+	int			 size, more;
 	key_code		 modifiers;
 	struct utf8_data	 ud;
 	u_int			 i;
@@ -177,7 +177,9 @@ key_string_lookup_string(const char *string)
 			if (strlen(string) != ud.size)
 				return (KEYC_NONE);
 			for (i = 1; i < ud.size; i++)
-				utf8_append(&ud, (u_char)string[i]);
+				more = utf8_append(&ud, (u_char)string[i]);
+			if (more != 0)
+				return (KEYC_NONE);
 			key = utf8_combine(&ud);
 			return (key | modifiers);
 		}