-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openbox: fix crash on alt+tab with fullscreen app
Apply an openbox patch to openbox recipe to fix crashes on alt+tab with fullscreen app. Github issue: openembedded/meta-openembedded#837 Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr> Suggested-by: Ludovic Jozeau <ludovic.jozeau@smile.fr> Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 85132c1) Signed-off-by: Armin Kuster <akuster808@gmail.com>
- Loading branch information
Showing
2 changed files
with
57 additions
and
0 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
...e/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001 | ||
From: pldubouilh <pldubouilh@gmail.com> | ||
Date: Fri, 17 Mar 2023 18:23:47 +0100 | ||
Subject: [PATCH] Fix list traversal issue in client_calc_layer | ||
|
||
The calls to client_calc_layer_internal can modify stacking_list, which | ||
can cause us to follow dangling ->next pointers (either by the pointer | ||
itself already being freed, or it pointing to a freed area). Avoid this | ||
by copying the list first, the goal is to visit every client in the list | ||
once so this should be fine. | ||
|
||
Upstream-Status: Backport [http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72] | ||
Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr> | ||
--- | ||
openbox/client.c | 9 +++++++-- | ||
1 file changed, 7 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/openbox/client.c b/openbox/client.c | ||
index 7168b240..b8264587 100644 | ||
--- a/openbox/client.c | ||
+++ b/openbox/client.c | ||
@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) | ||
void client_calc_layer(ObClient *self) | ||
{ | ||
GList *it; | ||
+ /* the client_calc_layer_internal calls below modify stacking_list, | ||
+ so we have to make a copy to iterate over */ | ||
+ GList *list = g_list_copy(stacking_list); | ||
|
||
/* skip over stuff above fullscreen layer */ | ||
- for (it = stacking_list; it; it = g_list_next(it)) | ||
+ for (it = list; it; it = g_list_next(it)) | ||
if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; | ||
|
||
/* find the windows in the fullscreen layer, and mark them not-visited */ | ||
@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) | ||
client_calc_layer_internal(self); | ||
|
||
/* skip over stuff above fullscreen layer */ | ||
- for (it = stacking_list; it; it = g_list_next(it)) | ||
+ for (it = list; it; it = g_list_next(it)) | ||
if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; | ||
|
||
/* now recalc any windows in the fullscreen layer which have not | ||
@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) | ||
!WINDOW_AS_CLIENT(it->data)->visited) | ||
client_calc_layer_internal(it->data); | ||
} | ||
+ | ||
+ g_list_free(it); | ||
} | ||
|
||
gboolean client_should_show(ObClient *self) | ||
-- | ||
2.34.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters