mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland-server: Remove error event posting from wl_resource_create

Browse source 
The wl_client_add/new_object() functions sends out an NO_MEMORY error if
the allocation fails.  This was convenient in a couple of places where
that was all the error handling that was needed.  Unfortunately that
looks like out-of-memory isn't handled at the call site and set a bad
precedent for not cleaning up properly or not handling at all.

As we're introducing wl_resource_create() as a replacement for those two
functions, let's remove the automatic error event posting and require
the caller to do that if necessary.

This commit also introduces a new helper, wl_client_post_no_memory() to
make it possible to send NO_MEMORY events from bind where we don't have
a wl_resource.
This commit is contained in:
Kristian Høgsberg 2013-07-02 15:39:03 -04:00
parent b5b1165008
commit c82a52a47e
3 changed files with 60 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/wayland-server.c
View file

@ -404,6 +404,13 @@ wl_client_get_object(struct wl_client *client, uint32_t id)
return wl_map_lookup(&client->objects, id);
}
WL_EXPORT void
wl_client_post_no_memory(struct wl_client *client)
{
wl_resource_post_error(client->display_resource,
WL_DISPLAY_ERROR_NO_MEMORY, "no memory");
}
WL_EXPORT void
wl_resource_post_no_memory(struct wl_resource *resource)
{
@ -599,6 +606,11 @@ display_sync(struct wl_client *client,
uint32_t serial;
callback = wl_resource_create(client, &wl_callback_interface, 1, id);
if (callback == NULL) {
wl_client_post_no_memory(client);
return;
}
serial = wl_display_get_serial(client->display);
wl_callback_send_done(callback, serial);
wl_resource_destroy(callback);
@ -621,6 +633,11 @@ display_get_registry(struct wl_client *client,
registry_resource =
wl_resource_create(client, &wl_registry_interface, 1, id);
if (registry_resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(registry_resource,
&registry_interface,
display, unbind_resource);
@ -655,6 +672,11 @@ bind_display(struct wl_client *client,
client->display_resource =
wl_resource_create(client, &wl_display_interface, 1, id);
if (client->display_resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(client->display_resource,
&display_interface, display,
destroy_client_display_resource);
@ -1007,10 +1029,8 @@ wl_resource_create(struct wl_client *client,
struct wl_resource *resource;
resource = malloc(sizeof *resource);
if (resource == NULL) {
wl_resource_post_no_memory(client->display_resource);
if (resource == NULL)
return NULL;
}
if (id == 0)
id = wl_map_insert_new(&client->objects, 0, NULL);
@ -1087,7 +1107,11 @@ wl_client_add_object(struct wl_client *client,
struct wl_resource *resource;
resource = wl_resource_create(client, interface, -1, id);
wl_resource_set_implementation(resource, implementation, data, NULL);
if (resource == NULL)
wl_client_post_no_memory(client);
else
wl_resource_set_implementation(resource,
implementation, data, NULL);
return resource;
}
@ -1105,7 +1129,11 @@ wl_client_new_object(struct wl_client *client,
struct wl_resource *resource;
resource = wl_resource_create(client, interface, -1, 0);
wl_resource_set_implementation(resource, implementation, data, NULL);
if (resource == NULL)
wl_client_post_no_memory(client);
else
wl_resource_set_implementation(resource,
implementation, data, NULL);
return resource;
}