blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #901 from emersion/layer-shell-minor-memory-leak 

layer-shell: fix small memory leak
This commit is contained in:
Drew DeVault 2018-04-25 11:39:25 +02:00 committed by GitHub
parent 99e9f08c4a 8e2f3056f8
commit 097561d6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_layer_shell.h
View File

@ -61,7 +61,7 @@ struct wlr_layer_surface {
struct wlr_layer_shell *shell; struct wlr_layer_shell *shell;
struct wl_list popups; // wlr_xdg_popup::link struct wl_list popups; // wlr_xdg_popup::link
const char *namespace; char *namespace;
enum zwlr_layer_shell_v1_layer layer; enum zwlr_layer_shell_v1_layer layer;
bool added, configured, mapped, closed; bool added, configured, mapped, closed;

31
types/wlr_layer_shell.c
View File

@ -183,6 +183,7 @@ static void layer_surface_destroy(struct wlr_layer_surface *surface) {
wl_list_init(&surface->surface_destroy_listener.link); wl_list_init(&surface->surface_destroy_listener.link);
wlr_surface_set_role_committed(surface->surface, NULL, NULL); wlr_surface_set_role_committed(surface->surface, NULL, NULL);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
free(surface->namespace);
free(surface); free(surface);
} }
@ -300,7 +301,7 @@ static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
} }
} }
static void handle_wlr_surface_destroyed(struct wl_listener *listener, static void handle_surface_destroyed(struct wl_listener *listener,
void *data) { void *data) {
struct wlr_layer_surface *layer_surface = struct wlr_layer_surface *layer_surface =
wl_container_of(listener, layer_surface, surface_destroy_listener); wl_container_of(listener, layer_surface, surface_destroy_listener);
@ -334,22 +335,28 @@ static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
if (output_resource) { if (output_resource) {
surface->output = wlr_output_from_resource(output_resource); surface->output = wlr_output_from_resource(output_resource);
} }
surface->resource = wl_resource_create(wl_client,
&zwlr_layer_surface_v1_interface,
wl_resource_get_version(client_resource),
id);
surface->namespace = strdup(namespace);
surface->layer = layer; surface->layer = layer;
if (surface->resource == NULL || surface->namespace == NULL) { if (layer > ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) {
free(surface);
wl_resource_post_error(surface->resource,
ZWLR_LAYER_SHELL_V1_ERROR_INVALID_LAYER,
"Invalid layer %d", layer);
return;
}
surface->namespace = strdup(namespace);
if (surface->namespace == NULL) {
free(surface); free(surface);
wl_client_post_no_memory(wl_client); wl_client_post_no_memory(wl_client);
return; return;
} }
if (layer > ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) { surface->resource = wl_resource_create(wl_client,
wl_resource_post_error(surface->resource, &zwlr_layer_surface_v1_interface,
ZWLR_LAYER_SHELL_V1_ERROR_INVALID_LAYER, wl_resource_get_version(client_resource),
"Invalid layer %d", layer); id);
if (surface->resource == NULL) {
free(surface->namespace);
free(surface); free(surface);
wl_client_post_no_memory(wl_client);
return; return;
} }
@ -359,7 +366,7 @@ static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
wl_signal_init(&surface->events.destroy); wl_signal_init(&surface->events.destroy);
wl_signal_add(&surface->surface->events.destroy, wl_signal_add(&surface->surface->events.destroy,
&surface->surface_destroy_listener); &surface->surface_destroy_listener);
surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed; surface->surface_destroy_listener.notify = handle_surface_destroyed;
wl_signal_init(&surface->events.map); wl_signal_init(&surface->events.map);
wl_signal_init(&surface->events.unmap); wl_signal_init(&surface->events.unmap);
wl_signal_init(&surface->events.new_popup); wl_signal_init(&surface->events.new_popup);