summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-07-10 19:00:12 -0400
committerDrew DeVault <ddevault@vistarmedia.com>2017-07-11 20:08:19 -0400
commitcd3da457993015146a077b75e7d23ef94a91c256 (patch)
tree6a1dbcfd7e147780e3a0635bbb7768f7f4799ac4
parent5882cb68827a8d47c3d98f85b753355b3f36f923 (diff)
Merge pull request #1270 from tobiasblass/bindsym_use_after_free
fix use-after-free bug
-rw-r--r--sway/commands/bind.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index af5a01e5..d9ea37b7 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -61,10 +61,11 @@ struct cmd_results *cmd_bindsym(int argc, char **argv) {
sym = ((char *)split->items[i])[strlen("button")] - '1' + M_LEFT_CLICK;
}
if (!sym) {
+ struct cmd_results *ret = cmd_results_new(CMD_INVALID, "bindsym",
+ "Unknown key '%s'", (char *)split->items[i]);
free_sway_binding(binding);
free_flat_list(split);
- return cmd_results_new(CMD_INVALID, "bindsym", "Unknown key '%s'",
- (char *)split->items[i]);
+ return ret;
}
xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));
if (!key) {