From 57295ebf206b9ebb22dcf415baa6b2970feddce4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 29 Aug 2011 16:02:57 -0400 Subject: [PATCH] compositor: Handle NULL buffer in input_device.attach correctly --- compositor/compositor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index 93e5eea..88b593e 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -1605,7 +1605,7 @@ input_device_attach(struct wl_client *client, struct wl_resource *buffer_resource, int32_t x, int32_t y) { struct wlsc_input_device *device = resource->data; - struct wl_buffer *buffer = buffer_resource->data; + struct wl_buffer *buffer; if (time < device->input_device.pointer_focus_time) return; @@ -1614,13 +1614,14 @@ input_device_attach(struct wl_client *client, if (device->input_device.pointer_focus->resource.client != client) return; - if (buffer == NULL) { + if (buffer_resource) { + buffer = buffer_resource->data; + wlsc_input_device_attach_buffer(device, buffer, x, y); + } else { wlsc_input_device_set_pointer_image(device, WLSC_POINTER_LEFT_PTR); return; } - - wlsc_input_device_attach_buffer(device, buffer, x, y); } const static struct wl_input_device_interface input_device_interface = { -- 2.7.4