From 5a2563b1a434cc63dd841708c60e353b89b9da05 Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Sat, 9 Jul 2022 14:05:04 -0400 Subject: workspace_create: Don't allow NULL name (cherry picked from commit 34933bb84350fe805d82276ea02d5732546e9993) --- sway/tree/workspace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) { struct sway_workspace *workspace_create(struct sway_output *output, const char *name) { + sway_assert(name, "NULL name given to workspace_create"); + if (output == NULL) { output = workspace_get_initial_output(name); } @@ -69,7 +71,7 @@ struct sway_workspace *workspace_create(struct sway_output *output, return NULL; } node_init(&ws->node, N_WORKSPACE, ws); - ws->name = name ? strdup(name) : NULL; + ws->name = strdup(name); ws->prev_split_layout = L_NONE; ws->layout = output_get_default_layout(output); ws->floating = create_list(); -- cgit v1.2.3-54-g00ecf