code.ossystems Code Review - meta-freescale.git/blob

   1 From 1194ccebc0db14ba681bd8272e01715b3e7008cc Mon Sep 17 00:00:00 2001
   2 From: Yong Gan <b45748@freescale.com>
   3 Date: Fri, 27 Jun 2014 11:33:53 +0800
   4 Subject: [PATCH] ENGR00320189 desktop-shell: Don't assume there is a pointer
   5  when resizing
   6
   7 Fixes a crash on touch devices without a pointer, when touching
   8 the window frame of a client.
   9 cherry-pick from 5872b6821be7c9c0a17a0de962e3f4a04f5d0c6f
  10
  11 Date: Jun 27, 2014
  12
  13 Upstream Status: N/A
  14
  15 Signed-off-by Yong Gan <B45748@freescale.com>
  16 ---
  17  desktop-shell/shell.c |    3 ++-
  18  1 file changed, 2 insertions(+), 1 deletion(-)
  19
  20 diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
  21 index 84f5c83..d965618 100644
  22 --- a/desktop-shell/shell.c
  23 +++ b/desktop-shell/shell.c
  24 @@ -1784,7 +1784,8 @@ common_surface_resize(struct wl_resource *resource,
  25         struct shell_surface *shsurf = wl_resource_get_user_data(resource);
  26         struct weston_surface *surface;
  27
  28 -       if (seat->pointer->button_count == 0 ||
  29 +       if (seat->pointer == NULL ||
  30 +           seat->pointer->button_count == 0 ||
  31             seat->pointer->grab_serial != serial ||
  32             seat->pointer->focus == NULL)
  33                 return;
  34 --
  35 1.7.9.5
  36