1 files changed, 7 insertions, 4 deletions

diff --git a/sway/commands.c b/sway/commands.c
index f6326038..9f6e5032 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -169,15 +169,18 @@ static struct cmd_results *cmd_assign(int argc, char **argv) {
 
         char *criteria = *argv++;
 
-        if (strncmp(*argv, "→", 1) == 0) {
+        if (strncmp(*argv, "→", strlen("→")) == 0) {
+                if (argc < 3) {
+                        return cmd_results_new(CMD_INVALID, "assign", "Missing workspace");
+                }
                 argv++;
         }
 
         char *movecmd = "move container to workspace ";
-        int arglen = strlen(*argv);
-        char *cmdlist = calloc(1, sizeof(movecmd) + arglen);
+        int arglen = strlen(movecmd) + strlen(*argv) + 1;
+        char *cmdlist = calloc(1, arglen);
 
-        sprintf(cmdlist, "%s%s", movecmd, *argv);
+        snprintf(cmdlist, arglen, "%s%s", movecmd, *argv);
 
         struct criteria *crit = malloc(sizeof(struct criteria));
         crit->crit_raw = strdup(criteria);