mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix uninitialized pointer in view_unmap

Browse source 
Otherwise, sway crashes due to uninitialized pointer
dereference when AddressSanitizer is active.
This commit is contained in:
frsfnrrg 2018-07-17 10:42:48 -04:00
parent f516dbfb6d
commit b3014f7b16
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/tree/view.c
View file

@ -621,16 +621,16 @@ void view_unmap(struct sway_view *view) {
view->urgent_timer = NULL; view->urgent_timer = NULL;
} }
struct sway_container *parent;
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
struct sway_container *parent;
if (view->is_fullscreen) { if (view->is_fullscreen) {
ws->sway_workspace->fullscreen = NULL; ws->sway_workspace->fullscreen = NULL;
parent = container_destroy(view->swayc); parent = container_destroy(view->swayc);
arrange_windows(ws->parent); arrange_windows(ws->parent);
} else { } else {
struct sway_container *parent = container_destroy(view->swayc); parent = container_destroy(view->swayc);
arrange_windows(parent); arrange_windows(parent);
} }
if (parent->type >= C_WORKSPACE) { // if the workspace still exists if (parent->type >= C_WORKSPACE) { // if the workspace still exists