diff options
author | Alexander Orzechowski <orzechowski.alexander@gmail.com> | 2022-07-09 14:05:04 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2022-11-11 23:44:03 +0100 |
commit | 34933bb84350fe805d82276ea02d5732546e9993 (patch) | |
tree | eba89ff1ccaaddb0af43882b0fc36572ebb8bf09 /sway/tree/workspace.c | |
parent | build: bump wlroots dependency to 0.17.0 (diff) | |
download | sway-34933bb84350fe805d82276ea02d5732546e9993.tar.gz sway-34933bb84350fe805d82276ea02d5732546e9993.tar.zst sway-34933bb84350fe805d82276ea02d5732546e9993.zip |
workspace_create: Don't allow NULL name
Diffstat (limited to 'sway/tree/workspace.c')
-rw-r--r-- | sway/tree/workspace.c | 4 |
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 | ||
57 | struct sway_workspace *workspace_create(struct sway_output *output, | 57 | struct 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(); |