From 097ed472920e01e2a4776e13c1e755265d8ec1f7 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Fri, 4 Nov 2022 12:38:19 +0200 Subject: [PATCH] hmi-controller: Add missing removal of destroy listener Shutting down the compositor gives us: Invalid write of size 8 at 0x4B1AEDB: wl_list_remove (wayland-util.c:56) by 0x4AF05BF: weston_signal_emit_mutable (signal.c:66) by 0x4ACBC2C: weston_compositor_destroy (compositor.c:8629) by 0x4864A4B: wet_main (main.c:3908) by 0x10915D: main (executable.c:33) Address 0x17435f20 is 224 bytes inside a block of size 384 free'd at 0x484617B: free (vg_replace_malloc.c:872) by 0x17718C7E: hmi_controller_destroy (hmi-controller.c:761) by 0x4AF059A: weston_signal_emit_mutable (signal.c:62) by 0x4ACBC2C: weston_compositor_destroy (compositor.c:8629) by 0x4864A4B: wet_main (main.c:3908) by 0x10915D: main (executable.c:33) Signed-off-by: Marius Vlad (cherry picked from commit cfbf2b0ab2ac7c50d8a1ea7645be3a9f3927825b) --- ivi-shell/hmi-controller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c index 8ae2230b..a1822762 100644 --- a/ivi-shell/hmi-controller.c +++ b/ivi-shell/hmi-controller.c @@ -738,6 +738,8 @@ hmi_controller_destroy(struct wl_listener *listener, void *data) struct hmi_controller *hmi_ctrl = container_of(listener, struct hmi_controller, destroy_listener); + wl_list_remove(&hmi_ctrl->destroy_listener.link); + wl_list_for_each_safe(link, next, &hmi_ctrl->workspace_fade.layer_list, link) { wl_list_remove(&link->link);