From e631ab6cde2fa0d0fe59cc4f5776c9a8b3002989 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Tue, 13 Dec 2011 14:53:54 +0200 Subject: [PATCH] client: fix a strdup memory leak Memory leak found by valgrinding simple-shm client. struct wl_global::interface is a strdup()'d string that was never freed. Make a function for freeing a wl_global, and use it. krh: Edit to name wl_global destructor wl_global_destroy. Signed-off-by: Pekka Paalanen --- src/wayland-client.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/wayland-client.c b/src/wayland-client.c index 22244f80..836a31c0 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -251,6 +251,14 @@ display_handle_global(void *data, id, interface, version, listener->data); } +static void +wl_global_destroy(struct wl_global *global) +{ + wl_list_remove(&global->link); + free(global->interface); + free(global); +} + static void display_handle_global_remove(void *data, struct wl_display *display, uint32_t id) @@ -259,8 +267,7 @@ display_handle_global_remove(void *data, wl_list_for_each(global, &display->global_list, link) if (global->id == id) { - wl_list_remove(&global->link); - free(global); + wl_global_destroy(global); break; } } @@ -394,7 +401,7 @@ wl_display_destroy(struct wl_display *display) wl_map_release(&display->objects); wl_list_for_each_safe(global, gnext, &display->global_list, link) - free(global); + wl_global_destroy(global); wl_list_for_each_safe(listener, lnext, &display->global_listener_list, link) free(listener);