From 4453ba084aae5a00318b9dfdeda95e8eaa17494c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 12 May 2011 21:27:57 -0400 Subject: [PATCH] server: Send error if client tries to bind to non-existant object --- wayland/wayland-server.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wayland/wayland-server.c b/wayland/wayland-server.c index 572a5a9..0d76bb0 100644 --- a/wayland/wayland-server.c +++ b/wayland/wayland-server.c @@ -505,8 +505,15 @@ display_bind(struct wl_client *client, struct wl_global *global; wl_list_for_each(global, &display->global_list, link) - if (global->object->id == id && global->func) - global->func(client, global->object, version); + if (global->object->id == id) + break; + + if (&global->link == &display->global_list) + wl_client_post_error(client, &client->display->object, + WL_DISPLAY_ERROR_INVALID_OBJECT, + "invalid object %d", id); + else if (global->func) + global->func(client, global->object, version); } static void -- 2.7.4