From 24916f2f6e4480143f0de026a727cc524fb797a8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 23 Nov 2016 16:44:42 +0000
Subject: Error on invalid modifier keys.

---
 key-string.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'key-string.c')

diff --git a/key-string.c b/key-string.c
index d513ec6f..9ee1c2d2 100644
--- a/key-string.c
+++ b/key-string.c
@@ -140,6 +140,9 @@ key_string_get_modifiers(const char **string)
 		case 's':
 			modifiers |= KEYC_SHIFT;
 			break;
+		default:
+			*string = NULL;
+			return 0;
 		}
 		*string += 2;
 	}
@@ -179,7 +182,7 @@ key_string_lookup_string(const char *string)
 		string++;
 	}
 	modifiers |= key_string_get_modifiers(&string);
-	if (string[0] == '\0')
+	if (string == NULL || string[0] == '\0')
 		return (KEYC_UNKNOWN);
 
 	/* Is this a standard ASCII key? */
-- 
cgit v1.2.3