diff options
author | Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2022-05-21 14:53:43 +0900 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-06-09 11:02:47 +0000 |
commit | ccc49e2211d0eefa0b3267490b5dbc9438c5c4e8 (patch) | |
tree | 7391982b1e3eef254ed2cd9f02dd1ed6ed9145bd /meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch | |
parent | b7f957063c3e58ce845830d6550aa6b512c3abef (diff) |
Fix build issue for wayland-ivi-extension in kirkstone
The wayland-ivi-extention has some issue in kirkstone.
Fail to find_package task.
Fail to build source code.
This patch fix these issue and up rev to Upstream HEAD.
Bug-AGL : SPEC-4329
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: I5bc34ec35d7af62939b08df143b37cc695613304
Diffstat (limited to 'meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch')
-rw-r--r-- | meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch deleted file mode 100644 index 095a25c9..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-NULL-pointer-exception-in-case-of-no-input-devic.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b1e5973764cc42aee113fcf82249d7dd74de4131 Mon Sep 17 00:00:00 2001 -From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> -Date: Thu, 7 Oct 2021 21:07:37 +0900 -Subject: [PATCH] Fix NULL pointer exception in case of no input device - -When weston with wayland-ivi-extension run without input device, -that crash by NULL access at setup_input_focus function. -In this case, st_focus->seat_ctx is NULL pointer, but it use -without NULL check in this function. - -This patch add NULL check for st_focus->seat_ctx. - -Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> ---- - .../src/ivi-input-controller.c | 24 ++++++++++--------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -index a0bfc48..e5f2e1d 100644 ---- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -+++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -@@ -1071,17 +1071,19 @@ setup_input_focus(struct input_context *ctx, uint32_t surface, - if (NULL != surf) { - wl_list_for_each(st_focus, &surf->accepted_seat_list, link) { - ctx_seat = st_focus->seat_ctx; -- if (device & ILM_INPUT_DEVICE_POINTER) { -- input_ctrl_ptr_set_focus_surf(ctx_seat, surf, enabled); -- } -- if (device & ILM_INPUT_DEVICE_KEYBOARD) { -- input_ctrl_kbd_set_focus_surf(ctx_seat, surf, enabled); -- } -- if (device & ILM_INPUT_DEVICE_TOUCH) { -- /*Touch focus cannot be forced to a particular surface. -- * Preserve the old behaviour by sending it to controller. -- * TODO: Should we just remove focus setting for touch?*/ -- send_input_focus(ctx, surf, device, enabled); -+ if (ctx_seat != NULL) { -+ if (device & ILM_INPUT_DEVICE_POINTER) { -+ input_ctrl_ptr_set_focus_surf(ctx_seat, surf, enabled); -+ } -+ if (device & ILM_INPUT_DEVICE_KEYBOARD) { -+ input_ctrl_kbd_set_focus_surf(ctx_seat, surf, enabled); -+ } -+ if (device & ILM_INPUT_DEVICE_TOUCH) { -+ /*Touch focus cannot be forced to a particular surface. -+ * Preserve the old behaviour by sending it to controller. -+ * TODO: Should we just remove focus setting for touch?*/ -+ send_input_focus(ctx, surf, device, enabled); -+ } - } - } - } --- -2.25.1 - |