From patchwork Tue Nov 19 20:01:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Koch X-Patchwork-Id: 292568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 911F52C0143 for ; Wed, 20 Nov 2013 07:03:46 +1100 (EST) Received: from localhost ([::1]:51446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VirWS-000053-2s for incoming@patchwork.ozlabs.org; Tue, 19 Nov 2013 15:03:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VirW5-0008Vl-Qp for qemu-devel@nongnu.org; Tue, 19 Nov 2013 15:03:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VirVz-0000vj-OW for qemu-devel@nongnu.org; Tue, 19 Nov 2013 15:03:21 -0500 Received: from fldsmtpe02.verizon.com ([140.108.26.141]:21503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VirVn-0000rx-F8; Tue, 19 Nov 2013 15:03:03 -0500 X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi03.verizon.com) ([166.68.71.145]) by fldsmtpe02.verizon.com with ESMTP; 19 Nov 2013 20:02:00 +0000 From: Don Koch X-IronPort-AV: E=Sophos;i="4.93,731,1378857600"; d="scan'208";a="596053466" Received: from unknown (HELO MIA20725CAS892.apps.tmrk.corp) ([162.47.0.51]) by fldsmtpi03.verizon.com with ESMTP; 19 Nov 2013 20:02:00 +0000 Received: from yoyo.cloudswitch.com (10.25.25.113) by MIA20725CAS892.apps.tmrk.corp (10.1.3.224) with Microsoft SMTP Server (TLS) id 14.2.318.1; Tue, 19 Nov 2013 15:01:59 -0500 Message-ID: <528BC3B7.2090205@terremark.com> Date: Tue, 19 Nov 2013 15:01:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: qemu-devel , qemu-trivial , Anthony Liguori X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.108.26.141 Subject: [Qemu-devel] [PATCH v2] Don't crash on keyboard input with no handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- v2: punt printf() ui/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } }