From: SeokYeon Hwang Date: Tue, 23 Aug 2016 06:38:51 +0000 (+0900) Subject: input: fix null pointer dereference before device realizing X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~27^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=943131895499f7f0040be0d94772f42d339de3f3;p=sdk%2Femulator%2Fqemu.git input: fix null pointer dereference before device realizing Change-Id: Ic988464da57ab65509eb28ea53effd23c1e54d73 Signed-off-by: SeokYeon Hwang --- diff --git a/tizen/src/hw/virtio/maru_virtio_input.c b/tizen/src/hw/virtio/maru_virtio_input.c index 78775e7878..bf72295709 100644 --- a/tizen/src/hw/virtio/maru_virtio_input.c +++ b/tizen/src/hw/virtio/maru_virtio_input.c @@ -162,6 +162,11 @@ static void input_common_reset(VirtIODevice *vdev) static bool check_ready(VirtIOMaruInput *input) { + if (!input) { + // device is not realized yet. + return false; + } + if (unlikely(!virtio_queue_ready(input->vq))) { LOG_INFO("virtqueue is not ready, dropping event.\n"); return false; @@ -420,11 +425,11 @@ static void virtio_keyboard_device_unrealize(DeviceState *dev, Error **errp) static void virtio_keyboard_device_reset(VirtIODevice *vdev) { - VirtIOKeyboard *vkbd = (VirtIOKeyboard *)vdev; + VirtIOKeyboard *kbd = (VirtIOKeyboard *)vdev; LOG_INFO("%s\n", __func__); - vkbd->extension_key = 0; + kbd->extension_key = 0; input_common_reset(vdev); }