summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-01-06 21:55:06 -0500
committerLibravatar GitHub <noreply@github.com>2018-01-06 21:55:06 -0500
commitc6d54f364f35018648708768f05224e3f0f317d7 (patch)
tree5701b81b0d5e8c22f89f0702271bb2b50898ba01
parentMerge pull request #1516 from AGausmann/issue-1507 (diff)
parentPrevent invalid free of workspace name (diff)
downloadsway-c6d54f364f35018648708768f05224e3f0f317d7.tar.gz
sway-c6d54f364f35018648708768f05224e3f0f317d7.tar.zst
sway-c6d54f364f35018648708768f05224e3f0f317d7.zip
Merge pull request #1559 from 4e554c4c/invalid_free
Prevent invalid free of workspace name
-rw-r--r--sway/workspace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/workspace.c b/sway/workspace.c
index e0367190..42525f3d 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -68,8 +68,9 @@ char *workspace_next_name(const char *output_name) {
68 sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", name); 68 sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", name);
69 char *_target = strdup(name); 69 char *_target = strdup(name);
70 strip_quotes(_target); 70 strip_quotes(_target);
71 while (isspace(*_target)) 71 while (isspace(*_target)) {
72 _target++; 72 memmove(_target, _target+1, strlen(_target+1));
73 }
73 74
74 // Make sure that the command references an actual workspace 75 // Make sure that the command references an actual workspace
75 // not a command about workspaces 76 // not a command about workspaces