From b3014f7b168eb074bd071ee7cb930d74158a2895 Mon Sep 17 00:00:00 2001 From: frsfnrrg Date: Tue, 17 Jul 2018 10:42:48 -0400 Subject: Fix uninitialized pointer in view_unmap Otherwise, sway crashes due to uninitialized pointer dereference when AddressSanitizer is active. --- sway/tree/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway') diff --git a/sway/tree/view.c b/sway/tree/view.c index 70ab9364..fc31699c 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -621,16 +621,16 @@ void view_unmap(struct sway_view *view) { view->urgent_timer = NULL; } - struct sway_container *parent; struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); + struct sway_container *parent; if (view->is_fullscreen) { ws->sway_workspace->fullscreen = NULL; parent = container_destroy(view->swayc); arrange_windows(ws->parent); } else { - struct sway_container *parent = container_destroy(view->swayc); + parent = container_destroy(view->swayc); arrange_windows(parent); } if (parent->type >= C_WORKSPACE) { // if the workspace still exists -- cgit v1.2.3-54-g00ecf