diff options
author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-01-23 20:20:24 +0100 |
---|---|---|
committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-01-23 20:22:51 +0100 |
commit | 449617f10465f685112415239420affbca9a389f (patch) | |
tree | 080a88e1c233da085636465f0da9bdcb15dd33bd /sway | |
parent | commands: Fix usage of arrow in assign (diff) | |
download | sway-449617f10465f685112415239420affbca9a389f.tar.gz sway-449617f10465f685112415239420affbca9a389f.tar.zst sway-449617f10465f685112415239420affbca9a389f.zip |
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>
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands.c | 6 |
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) { | |||
177 | } | 177 | } |
178 | 178 | ||
179 | char *movecmd = "move container to workspace "; | 179 | char *movecmd = "move container to workspace "; |
180 | int arglen = strlen(*argv); | 180 | int arglen = strlen(movecmd) + strlen(*argv) + 1; |
181 | char *cmdlist = calloc(1, sizeof(movecmd) + arglen); | 181 | char *cmdlist = calloc(1, arglen); |
182 | 182 | ||
183 | sprintf(cmdlist, "%s%s", movecmd, *argv); | 183 | snprintf(cmdlist, arglen, "%s%s", movecmd, *argv); |
184 | 184 | ||
185 | struct criteria *crit = malloc(sizeof(struct criteria)); | 185 | struct criteria *crit = malloc(sizeof(struct criteria)); |
186 | crit->crit_raw = strdup(criteria); | 186 | crit->crit_raw = strdup(criteria); |