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

compositor: Remove double free()s in resource destructors

Browse Source 
With the change to move free()ing of the wl_resource into wayland-server, we now have
a few cases where we double free the resource in the destructor.  This patch
removes those.
This commit is contained in:
Kristian Høgsberg
2013-06-25 10:29:30 -04:00
parent 88dab17b0e
commit 6c8d778646
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
-2
View File
@@ -2206,8 +2206,6 @@ subsurface_resource_destroy(struct wl_resource *resource)
if (sub) if (sub)
weston_subsurface_destroy(sub); weston_subsurface_destroy(sub);
free(resource);
} }
static void static void
src/input.c
-1
View File
@@ -40,7 +40,6 @@ empty_region(pixman_region32_t *region)
static void unbind_resource(struct wl_resource *resource) static void unbind_resource(struct wl_resource *resource)
{ {
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
free(resource);
} }
void void
src/text-backend.c
-4
View File
@@ -533,8 +533,6 @@ unbind_keyboard(struct wl_resource *resource)
input_method_context_end_keyboard_grab(context); input_method_context_end_keyboard_grab(context);
context->keyboard = NULL; context->keyboard = NULL;
free(resource);
} }
static void static void
@@ -746,8 +744,6 @@ unbind_input_method(struct wl_resource *resource)
input_method->context = NULL; input_method->context = NULL;
text_backend->input_method.binding = NULL; text_backend->input_method.binding = NULL;
free(resource);
} }
static void static void