Merge pull request #2451 from RyanDwyer/fix-ancestor-crash

Fix container_has_ancestor crash
6 years ago · b6428f4751
parent 2aa6d98c5a 5f3757c927
commit b6428f4751
1 changed files with 1 additions and 1 deletions
--- 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;