mirror of
https://github.com/swaywm/sway.git
synced 2024-12-28 07:56:31 +01:00
container: Fix crash when view unmaps + maps quickly
Followup on4e4898e90f
. If a view quickly maps and unmaps repeatedly, there will be multiple destroyed containers with same view in a single transaction. Each of these containers will then try to destroy this view, resulting in use after free. The container should only destroy the view if the view still belongs to the container. Simple reproducer: couple XMapWindow + XUnmapWindow in a loop followed by XDestroyWindow. See #6605 (cherry picked from commitf92329701b
)
This commit is contained in:
parent
44bb0aa3ee
commit
828a9a3cfb
1 changed files with 2 additions and 4 deletions
|
@ -80,10 +80,8 @@ void container_destroy(struct sway_container *con) {
|
|||
wlr_texture_destroy(con->marks_urgent);
|
||||
wlr_texture_destroy(con->marks_focused_tab_title);
|
||||
|
||||
if (con->view) {
|
||||
if (con->view->container == con) {
|
||||
con->view->container = NULL;
|
||||
}
|
||||
if (con->view && con->view->container == con) {
|
||||
con->view->container = NULL;
|
||||
if (con->view->destroying) {
|
||||
view_destroy(con->view);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue