Patchwork [PULL,12/14] Don't crash on keyboard input with no handler

login
register
mail settings
Submitter Michael Tokarev
Date Dec. 6, 2013, 7:15 p.m.
Message ID <1386357341-19147-13-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/298219/
State New
Headers show

Comments

Michael Tokarev - Dec. 6, 2013, 7:15 p.m.
From: Don Koch <dkoch@verizon.com>

Prevent a call to put_kbd if null.

On shutdown of some OSes, the keyboard handler goes away before the
system is down. If a key is typed during this window, qemu crashes.

Signed-off-by: Don Koch <dkoch@verizon.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 ui/input.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/ui/input.c b/ui/input.c
index 10d8c05..1c70f60 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -414,7 +414,7 @@  void kbd_put_keycode(int keycode)
     if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
         return;
     }
-    if (entry) {
+    if (entry && entry->put_kbd) {
         entry->put_kbd(entry->opaque, keycode);
     }
 }