diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-09-15 09:42:46 +0100 |
|---|---|---|
| committer | Ian Fan <ianfan0@gmail.com> | 2018-09-15 09:42:49 +0100 |
| commit | 34dbbb1314af16e388c7517aec6427baa00fb179 (patch) | |
| tree | a05b996b9f513e008f8879fab5604462853e156b | |
| parent | 1c292fd43abf1c3bc86e91bd348f690aea820c85 (diff) | |
ipc: handle NULL cases for node_get_output
| -rw-r--r-- | sway/ipc-json.c | 5 | ||||
| -rw-r--r-- | sway/tree/node.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 30c0a8e1..52278be2 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -316,9 +316,12 @@ static void focus_inactive_children_iterator(struct sway_node *node, struct focus_inactive_data *data = _data; json_object *focus = data->object; if (data->node == &root->node) { - int len = json_object_array_length(focus); struct sway_output *output = node_get_output(node); + if (output == NULL) { + return; + } size_t id = output->node.id; + int len = json_object_array_length(focus); for (int i = 0; i < len; ++i) { if ((size_t) json_object_get_int(json_object_array_get_idx(focus, i)) == id) { return; diff --git a/sway/tree/node.c b/sway/tree/node.c index 74661c1a..dcab1c9b 100644 --- a/sway/tree/node.c +++ b/sway/tree/node.c @@ -74,8 +74,10 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) { struct sway_output *node_get_output(struct sway_node *node) { switch (node->type) { - case N_CONTAINER: - return node->sway_container->workspace->output; + case N_CONTAINER: { + struct sway_workspace *ws = node->sway_container->workspace; + return ws ? ws->output : NULL; + } case N_WORKSPACE: return node->sway_workspace->output; case N_OUTPUT: |