From 5f3757c92763ce66c6cf043fdb22f3c12ce606cd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 12 Aug 2018 00:13:43 +1000 Subject: [PATCH] Fix container_has_ancestor crash Fixes #2450 --- sway/tree/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index 435d71e27..45e54080b 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;