exec: fix validation during config reload

Split cmd_exec_always into separate methods for general validation and
process creation. This fixes a potential call of join_args with 0 arguments.

1 files changed, 5 insertions, 2 deletions

diff --git a/sway/commands/exec.c b/sway/commands/exec.c
index 87d90716..2c6f3d2d 100644
--- a/sway/commands/exec.c
+++ b/sway/commands/exec.c
@@ -5,12 +5,15 @@
 #include "stringop.h"
 
 struct cmd_results *cmd_exec(int argc, char **argv) {
-	if (!config->active) return cmd_results_new(CMD_DEFER, NULL);
+	struct cmd_results *error = NULL;
+	if ((error = cmd_exec_validate(argc, argv))) {
+		return error;
+	}
 	if (config->reloading) {
 		char *args = join_args(argv, argc);
 		sway_log(SWAY_DEBUG, "Ignoring 'exec %s' due to reload", args);
 		free(args);
 		return cmd_results_new(CMD_SUCCESS, NULL);
 	}
-	return cmd_exec_always(argc, argv);
+	return cmd_exec_process(argc, argv);
 }