Hotkeys: shouldn't be allowed to register non printable "keys"

gemrb · May 13, 2018 · 2ee2ca5 · 2ee2ca5
1 parent d67ecca
commit 2ee2ca5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gemrb/core/GUI/Button.cpp b/gemrb/core/GUI/Button.cpp
@@ -755,10 +755,6 @@ void Button::SetPushOffset(ieWord x, ieWord y)
 
 bool Button::SetHotKey(KeyboardKey key, short mod, bool global)
 {
-	if (key < ' ') {
-		return false;
-	}
-
 	UnregisterHotKey();
 
 	if (global) {

diff --git a/gemrb/core/GUI/EventMgr.cpp b/gemrb/core/GUI/EventMgr.cpp
@@ -155,6 +155,10 @@ void EventMgr::DispatchEvent(Event& e)
 
 bool EventMgr::RegisterHotKeyCallback(EventCallback* cb, KeyboardKey key, short mod)
 {
+	if (key < ' ') {
+		return false;
+	}
+
 	int flags = mod << 16;
 	flags |= key;
 

diff --git a/gemrb/core/GUI/Window.cpp b/gemrb/core/GUI/Window.cpp
@@ -395,6 +395,10 @@ bool Window::InHandler() const
 
 bool Window::RegisterHotKeyCallback(EventMgr::EventCallback* cb, KeyboardKey key)
 {
+	if (key < ' ') {
+		return false;
+	}
+
 	std::map<KeyboardKey, EventMgr::EventCallback*>::iterator it;
 	it = HotKeys.find(key);
 	if (it != HotKeys.end()) {