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

compositor: Fix remaining double free()s

Browse Source 
Previous commit didn't catch all double free()s, hopefully this one does.
dev
Kristian Høgsberg 12 years ago
parent 6c8d778646
commit f00460771e
3 changed files with 0 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/compositor.c
  2. 1
      src/data-device.c
  3. 4
      src/shell.c

1
src/compositor.c
Unescape View File

@ -2512,7 +2512,6 @@ weston_compositor_stack_plane(struct weston_compositor *ec,
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);
} }
static void static void

1
src/data-device.c
Unescape View File

@ -555,7 +555,6 @@ create_data_source(struct wl_client *client,
static void unbind_data_device(struct wl_resource *resource) static void unbind_data_device(struct wl_resource *resource)
{ {
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
free(resource);
} }
static void static void

4
src/shell.c
Unescape View File

@ -1006,7 +1006,6 @@ static void
unbind_resource(struct wl_resource *resource) unbind_resource(struct wl_resource *resource)
{ {
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
free(resource);
} }
static void static void
@ -3614,7 +3613,6 @@ unbind_desktop_shell(struct wl_resource *resource)
shell->child.desktop_shell = NULL; shell->child.desktop_shell = NULL;
shell->prepare_event_sent = false; shell->prepare_event_sent = false;
free(resource);
} }
static void static void
@ -3693,7 +3691,6 @@ unbind_screensaver(struct wl_resource *resource)
struct desktop_shell *shell = wl_resource_get_user_data(resource); struct desktop_shell *shell = wl_resource_get_user_data(resource);
shell->screensaver.binding = NULL; shell->screensaver.binding = NULL;
free(resource);
} }
static void static void
@ -3916,7 +3913,6 @@ unbind_input_panel(struct wl_resource *resource)
struct desktop_shell *shell = wl_resource_get_user_data(resource); struct desktop_shell *shell = wl_resource_get_user_data(resource);
shell->input_panel.binding = NULL; shell->input_panel.binding = NULL;
free(resource);
} }
static void static void

Write Preview
Loading…
Cancel
Save