[PATCH weston] input: fix access to invalid resource

[Marek Chalupa]

Look OK,

it can not hurt to add this check in any case.

On 10 October 2014 22:46, Giulio Camuffo <giuliocamuffo at gmail.com> wrote:

> the keyboard focus surface may not have a valid resource (server side
> surface or a surface surviving its client), so check if it is valid
> before using it.
> ---
>  src/input.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/input.c b/src/input.c
> index e765221..bc58223 100644
> --- a/src/input.c
> +++ b/src/input.c
> @@ -1803,7 +1803,7 @@ seat_get_keyboard(struct wl_client *client, struct
> wl_resource *resource,
>                                            seat->keyboard->focus_serial);
>         }
>
> -       if (seat->keyboard->focus &&
> +       if (seat->keyboard->focus && seat->keyboard->focus->resource &&
>             wl_resource_get_client(seat->keyboard->focus->resource) ==
> client) {
>                 struct weston_surface *surface =
>                         (struct weston_surface *) seat->keyboard->focus;
> --
> 2.1.2
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20141015/7f05ddbf/attachment.html>