sway

commit 38c44f2f27f218ed7e61c9910491eef78551d8ea
parent 82cb3797275168c5618c7283a90cc84bf21beb45
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 24 Apr 2018 10:53:05 +0200

Merge pull request #1851 from RyanDwyer/container-descendants-crash

Fix crash in container_descendants()
Diffstat:
M
sway/tree/container.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -355,14 +355,15 @@ struct sway_container *container_view_create(struct sway_container *sibling,
 void container_descendants(struct sway_container *root,
 		enum sway_container_type type,
 		void (*func)(struct sway_container *item, void *data), void *data) {
+	if (!root->children || !root->children->length) {
+		return;
+	}
 	for (int i = 0; i < root->children->length; ++i) {
 		struct sway_container *item = root->children->items[i];
 		if (item->type == type) {
 			func(item, data);
 		}
-		if (item->children && item->children->length) {
-			container_descendants(item, type, func, data);
-		}
+		container_descendants(item, type, func, data);
 	}
 }