mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-11 18:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Fix crash in container_descendants()
This commit is contained in:
Drew DeVault 2018-04-24 10:53:05 +02:00 committed by GitHub
parent 82cb379727 22b9169631
commit 38c44f2f27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/tree/container.c
View file

@ -355,16 +355,17 @@ struct sway_container *container_view_create(struct sway_container *sibling,
void container_descendants(struct sway_container *root, void container_descendants(struct sway_container *root,
enum sway_container_type type, enum sway_container_type type,
void (*func)(struct sway_container *item, void *data), void *data) { 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) { for (int i = 0; i < root->children->length; ++i) {
struct sway_container *item = root->children->items[i]; struct sway_container *item = root->children->items[i];
if (item->type == type) { if (item->type == type) {
func(item, data); func(item, data);
} }
if (item->children && item->children->length) {
container_descendants(item, type, func, data); container_descendants(item, type, func, data);
} }
} }
}
struct sway_container *container_find(struct sway_container *container, struct sway_container *container_find(struct sway_container *container,
bool (*test)(struct sway_container *view, void *data), void *data) { bool (*test)(struct sway_container *view, void *data), void *data) {