From 22b916963146d6235a49f3c9283e956e42fb22e9 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 24 Apr 2018 12:27:04 +1000 Subject: [PATCH] Fix crash in container_descendants() If root is a C_VIEW, the children property is a null pointer. --- sway/tree/container.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index f14e9b9a..bd9f9894 100644 --- 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); } }