mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Check wl_resource_create() return value

Browse Source 
This fixes a number of call-sites to properly check for NULL and return
the no memory event when allocation fail.
This commit is contained in:
Kristian Høgsberg 2013-08-06 16:46:25 -07:00
parent b10b44b58c
commit 0ff7908767
3 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/compositor.c
View File

@ -1492,9 +1492,14 @@ surface_frame(struct wl_client *client,
return;
}
cb->resource = wl_resource_create(client,
&wl_callback_interface,
1, callback);
cb->resource = wl_resource_create(client, &wl_callback_interface, 1,
callback);
if (cb->resource == NULL) {
free(cb);
wl_resource_post_no_memory(resource);
return;
}
wl_resource_set_implementation(cb->resource, NULL, cb,
destroy_frame_callback);
@ -1696,6 +1701,11 @@ compositor_create_surface(struct wl_client *client,
surface->resource =
wl_resource_create(client, &wl_surface_interface,
wl_resource_get_version(resource), id);
if (surface->resource == NULL) {
weston_surface_destroy(surface);
wl_resource_post_no_memory(resource);
return;
}
wl_resource_set_implementation(surface->resource, &surface_interface,
surface, destroy_surface);
}
@ -1759,6 +1769,11 @@ compositor_create_region(struct wl_client *client,
region->resource =
wl_resource_create(client, &wl_region_interface, 1, id);
if (region->resource == NULL) {
free(region);
wl_resource_post_no_memory(resource);
return;
}
wl_resource_set_implementation(region->resource, &region_interface,
region, destroy_region);
}
@ -2419,10 +2434,12 @@ bind_subcompositor(struct wl_client *client,
resource =
wl_resource_create(client, &wl_subcompositor_interface, 1, id);
if (resource)
wl_resource_set_implementation(resource,
&subcompositor_interface,
compositor, NULL);
if (resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(resource, &subcompositor_interface,
compositor, NULL);
}
static void
@ -2542,6 +2559,10 @@ bind_output(struct wl_client *client,
resource = wl_resource_create(client, &wl_output_interface,
MIN(version, 2), id);
if (resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_list_insert(&output->resource_list, wl_resource_get_link(resource));
wl_resource_set_implementation(resource, NULL, data, unbind_resource);
@ -2813,9 +2834,13 @@ compositor_bind(struct wl_client *client,
resource = wl_resource_create(client, &wl_compositor_interface,
MIN(version, 3), id);
if (resource)
wl_resource_set_implementation(resource, &compositor_interface,
compositor, NULL);
if (resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(resource, &compositor_interface,
compositor, NULL);
}
static void

17
src/data-device.c
View File

@ -577,8 +577,13 @@ get_data_device(struct wl_client *client,
resource = wl_resource_create(client,
&wl_data_device_interface, 1, id);
if (resource == NULL) {
wl_resource_post_no_memory(manager_resource);
return;
}
wl_list_insert(&seat->drag_resource_list, wl_resource_get_link(resource));
wl_list_insert(&seat->drag_resource_list,
wl_resource_get_link(resource));
wl_resource_set_implementation(resource, &data_device_interface,
seat, unbind_data_device);
}
@ -597,9 +602,13 @@ bind_manager(struct wl_client *client,
resource =
wl_resource_create(client,
&wl_data_device_manager_interface, 1, id);
if (resource)
wl_resource_set_implementation(resource, &manager_interface,
NULL, NULL);
if (resource == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_resource_set_implementation(resource, &manager_interface,
NULL, NULL);
}
WL_EXPORT void

15
src/input.c
View File

@ -1177,6 +1177,11 @@ seat_get_pointer(struct wl_client *client, struct wl_resource *resource,
cr = wl_resource_create(client, &wl_pointer_interface,
wl_resource_get_version(resource), id);
if (cr == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_list_insert(&seat->pointer->resource_list, wl_resource_get_link(cr));
wl_resource_set_implementation(cr, &pointer_interface, seat->pointer,
unbind_resource);
@ -1211,6 +1216,11 @@ seat_get_keyboard(struct wl_client *client, struct wl_resource *resource,
cr = wl_resource_create(client, &wl_keyboard_interface,
wl_resource_get_version(resource), id);
if (cr == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_list_insert(&seat->keyboard->resource_list, wl_resource_get_link(cr));
wl_resource_set_implementation(cr, NULL, seat, unbind_resource);
@ -1246,6 +1256,11 @@ seat_get_touch(struct wl_client *client, struct wl_resource *resource,
cr = wl_resource_create(client, &wl_touch_interface,
wl_resource_get_version(resource), id);
if (cr == NULL) {
wl_client_post_no_memory(client);
return;
}
wl_list_insert(&seat->touch->resource_list, wl_resource_get_link(cr));
wl_resource_set_implementation(cr, NULL, seat, unbind_resource);
}