compositor: Handle OOM in weston_buffer_from_resource()

Handle NULL-return in call-sites as well.
dev
Kristian Høgsberg 11 years ago
parent 980b018825
commit 08b58c7c12
  1. 27
      src/compositor.c
  2. 4
      src/screenshooter.c

@ -1077,17 +1077,18 @@ weston_buffer_from_resource(struct wl_resource *resource)
listener = wl_resource_get_destroy_listener(resource, listener = wl_resource_get_destroy_listener(resource,
weston_buffer_destroy_handler); weston_buffer_destroy_handler);
if (listener) { if (listener)
buffer = container_of(listener, struct weston_buffer, return container_of(listener, struct weston_buffer,
destroy_listener); destroy_listener);
} else {
buffer = zalloc(sizeof *buffer); buffer = zalloc(sizeof *buffer);
buffer->resource = resource; if (buffer == NULL)
wl_signal_init(&buffer->destroy_signal); return NULL;
buffer->destroy_listener.notify = weston_buffer_destroy_handler;
wl_resource_add_destroy_listener(resource, buffer->resource = resource;
&buffer->destroy_listener); wl_signal_init(&buffer->destroy_signal);
} buffer->destroy_listener.notify = weston_buffer_destroy_handler;
wl_resource_add_destroy_listener(resource, &buffer->destroy_listener);
return buffer; return buffer;
} }
@ -1443,6 +1444,10 @@ surface_attach(struct wl_client *client,
if (buffer_resource) if (buffer_resource)
buffer = weston_buffer_from_resource(buffer_resource); buffer = weston_buffer_from_resource(buffer_resource);
if (buffer == NULL) {
wl_client_post_no_memory(client);
return;
}
/* Attach, attach, without commit in between does not send /* Attach, attach, without commit in between does not send
* wl_buffer.release. */ * wl_buffer.release. */

@ -180,6 +180,10 @@ screenshooter_shoot(struct wl_client *client,
struct weston_buffer *buffer = struct weston_buffer *buffer =
weston_buffer_from_resource(buffer_resource); weston_buffer_from_resource(buffer_resource);
if (buffer == NULL) {
wl_resource_post_no_memory(resource);
return;
}
if (!wl_shm_buffer_get(buffer->resource)) if (!wl_shm_buffer_get(buffer->resource))
return; return;

Loading…
Cancel
Save