alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

seatop_move_tiling: do not move to descendant

Browse source 
In seatop_move_tiling, it is possible to cause a stack overflow by
dragging a container into one of its descendants. This disables the
ability to move into a descendant.
This commit is contained in:
Brian Ashworth 2019-02-13 22:38:30 -05:00 committed by emersion
parent ab42874f71
commit e8c472aee9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/input/seatop_move_tiling.c
View file

@ -164,7 +164,8 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
// Use the hovered view - but we must be over the actual surface // Use the hovered view - but we must be over the actual surface
con = node->sway_container; con = node->sway_container;
if (!con->view->surface || node == &e->con->node) { if (!con->view->surface || node == &e->con->node
|| node_has_ancestor(node, &e->con->node)) {
e->target_node = NULL; e->target_node = NULL;
e->target_edge = WLR_EDGE_NONE; e->target_edge = WLR_EDGE_NONE;
return; return;