aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-12 00:13:43 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-08-12 00:14:52 +1000
commit5f3757c92763ce66c6cf043fdb22f3c12ce606cd (patch)
tree795fe72b9de75bc7fae93b72d7c470d170d97b0d /sway/tree
parent2aa6d98c5a6d37c759e1e9cc84032a95fb193793 (diff)
downloadsway-5f3757c92763ce66c6cf043fdb22f3c12ce606cd.tar.xz
Fix container_has_ancestor crash
Fixes #2450
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 435d71e2..45e54080 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -769,7 +769,7 @@ void container_for_each_descendant(struct sway_container *container,
bool container_has_ancestor(struct sway_container *descendant,
struct sway_container *ancestor) {
- while (descendant->type != C_ROOT) {
+ while (descendant && descendant->type != C_ROOT) {
descendant = descendant->parent;
if (descendant == ancestor) {
return true;