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

container_at_{tabbed,stacked}: check x-axis bounds

Browse source 
The container_at_tabbed and container_at_stacked container were checking
the bounds along the y-axis, but not the x-axis. This made it possible
to cause a segfault for specific resolution, horizontal gap, and
workspace children lengths. The issue is that child_index was -1 and was
resulting in a buffer underflow. Adding the x-axis bound checks for
early returns should prevent this from happening.
This commit is contained in:
Brian Ashworth 2020-02-10 20:52:34 -05:00 committed by Simon Ser
parent 803e89018a
commit 0b709702c1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/container.c
View file

@ -208,7 +208,8 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
struct wlr_box box; struct wlr_box box;
node_get_box(parent, &box); node_get_box(parent, &box);
if (ly < box.y || ly > box.y + box.height) { if (lx < box.x || lx > box.x + box.width ||
ly < box.y || ly > box.y + box.height) {
return NULL; return NULL;
} }
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
@ -242,7 +243,8 @@ static struct sway_container *container_at_stacked(struct sway_node *parent,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
struct wlr_box box; struct wlr_box box;
node_get_box(parent, &box); node_get_box(parent, &box);
if (ly < box.y || ly > box.y + box.height) { if (lx < box.x || lx > box.x + box.width ||
ly < box.y || ly > box.y + box.height) {
return NULL; return NULL;
} }
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();