aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Alexander Orzechowski <orzechowski.alexander@gmail.com>2022-07-09 14:05:04 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2022-11-26 10:29:58 +0100
commit5a2563b1a434cc63dd841708c60e353b89b9da05 (patch)
tree164925cb7446b1618308d183531b62ebea2be70a
parentci: checkout wlroots 0.16.0 (diff)
downloadsway-5a2563b1a434cc63dd841708c60e353b89b9da05.tar.gz
sway-5a2563b1a434cc63dd841708c60e353b89b9da05.tar.zst
sway-5a2563b1a434cc63dd841708c60e353b89b9da05.zip
workspace_create: Don't allow NULL name
(cherry picked from commit 34933bb84350fe805d82276ea02d5732546e9993)
-rw-r--r--sway/tree/workspace.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 0c4e97a3..ee940466 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -56,6 +56,8 @@ struct sway_output *workspace_get_initial_output(const char *name) {
56 56
57struct sway_workspace *workspace_create(struct sway_output *output, 57struct sway_workspace *workspace_create(struct sway_output *output,
58 const char *name) { 58 const char *name) {
59 sway_assert(name, "NULL name given to workspace_create");
60
59 if (output == NULL) { 61 if (output == NULL) {
60 output = workspace_get_initial_output(name); 62 output = workspace_get_initial_output(name);
61 } 63 }
@@ -69,7 +71,7 @@ struct sway_workspace *workspace_create(struct sway_output *output,
69 return NULL; 71 return NULL;
70 } 72 }
71 node_init(&ws->node, N_WORKSPACE, ws); 73 node_init(&ws->node, N_WORKSPACE, ws);
72 ws->name = name ? strdup(name) : NULL; 74 ws->name = strdup(name);
73 ws->prev_split_layout = L_NONE; 75 ws->prev_split_layout = L_NONE;
74 ws->layout = output_get_default_layout(output); 76 ws->layout = output_get_default_layout(output);
75 ws->floating = create_list(); 77 ws->floating = create_list();