diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2020-02-10 20:52:34 -0500 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-02-11 10:09:37 +0100 |
| commit | 0b709702c134fcba2b8210ac6f85b8b2665484d0 (patch) | |
| tree | 39122568182a85d9513a4f189c760db0356e0ea7 /sway/tree | |
| parent | 803e89018ab899a44e1ca24758d981dff27d5986 (diff) | |
| download | sway-0b709702c134fcba2b8210ac6f85b8b2665484d0.tar.xz | |
container_at_{tabbed,stacked}: check x-axis bounds
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.
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 56cdee1d..afb0f927 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -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_box 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; } 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_box 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; } struct sway_seat *seat = input_manager_current_seat(); |