summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2014-01-07 18:55:13 +0000
committerChad Versace <chad.versace@linux.intel.com>2014-01-08 15:46:36 -0800
commitfe3bf2f1da2649109e88dbd92df40f4b495f406c (patch)
treec6c66474ca1ddbe85c2cc44c4a61e5c40042dac1
parent43cd22d5f414f2cdb6fa91f1cf531857b6e4d227 (diff)
wayland: add a handler for global remove event
The Wayland event dispatch infrastructure does not check if the event handler member is NULL before dereferencing the appropriate member in the listener. This change supplies an empty function as the event handler for the global remove event on the wl_registry listener rather than the previously supplied NULL value. Signed-off-by: Rob Bradford <rob@linux.intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--src/waffle/wayland/wayland_display.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/waffle/wayland/wayland_display.c b/src/waffle/wayland/wayland_display.c
index ec9d336..e7c6e94 100644
--- a/src/waffle/wayland/wayland_display.c
+++ b/src/waffle/wayland/wayland_display.c
@@ -76,9 +76,16 @@ registry_listener_global(void *data,
}
}
+static void
+registry_listener_global_remove(void *data,
+ struct wl_registry *registry,
+ uint32_t name)
+{
+}
+
static const struct wl_registry_listener registry_listener = {
.global = registry_listener_global,
- .global_remove = NULL,
+ .global_remove = registry_listener_global_remove
};
struct wcore_display*