From 995bf51b2cc622762b7d9079f03ab46d4055cd37 Mon Sep 17 00:00:00 2001 From: Markus Ongyerth Date: Mon, 30 Apr 2018 11:35:50 +0200 Subject: [PATCH] weston-info: destroy wl_keyboard Fixes a memory leak by calling wl_keyboard_destroy on any keyboard that was used to listen for events. Signed-off-by: Markus Ongyerth Acked-by: Pekka Paalanen Reviewed-by: Peter Hutterer --- clients/weston-info.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clients/weston-info.c b/clients/weston-info.c index 6606117a9..609e270a4 100644 --- a/clients/weston-info.c +++ b/clients/weston-info.c @@ -118,6 +118,7 @@ struct seat_info { struct wl_seat *seat; struct weston_info *info; + struct wl_keyboard *keyboard; uint32_t capabilities; char *name; @@ -498,10 +499,8 @@ seat_handle_capabilities(void *data, struct wl_seat *wl_seat, return; if (caps & WL_SEAT_CAPABILITY_KEYBOARD) { - struct wl_keyboard *keyboard; - - keyboard = wl_seat_get_keyboard(seat->seat); - wl_keyboard_add_listener(keyboard, &keyboard_listener, + seat->keyboard = wl_seat_get_keyboard(seat->seat); + wl_keyboard_add_listener(seat->keyboard, &keyboard_listener, seat); seat->info->roundtrip_needed = true; @@ -531,6 +530,9 @@ destroy_seat_info(void *data) if (seat->name != NULL) free(seat->name); + if (seat->keyboard) + wl_keyboard_destroy(seat->keyboard); + wl_list_remove(&seat->global_link); }