aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-01-23 20:20:24 +0100
committerQuentin Glidic <sardemff7+git@sardemff7.net>2016-01-23 20:22:51 +0100
commit449617f10465f685112415239420affbca9a389f (patch)
tree080a88e1c233da085636465f0da9bdcb15dd33bd
parent43483d8fee3b61a8dbd2734963597d7fc69c7934 (diff)
commands: Fix memory allocation in assign
Also use the safer snprintf since we just computed the size. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
-rw-r--r--sway/commands.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c
index fc3444ee..9f6e5032 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -177,10 +177,10 @@ static struct cmd_results *cmd_assign(int argc, char **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);