diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-11-21 16:45:17 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-11-21 16:45:17 +0000 |
| commit | 106e14391f7e9749122a924a202aa297e495c8ce (patch) | |
| tree | 9bb02a46ec8821017e7e6f1849b2ba881a4f0f53 | |
| parent | Merge branch 'remove-unreachable' (diff) | |
| parent | Fix parsing key-bindings config to not read past the end of the string. (diff) | |
Merge branch 'fix-809'
Closes #809
| -rw-r--r-- | config.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1637,12 +1637,12 @@ argv_compare(char *const *argv1, char *const *argv2) * filled with {'cmd-to-exec', 'arg1', 'arg2', NULL} * * Returns: - * - ssize_t, number of bytes to strip from 'value' to remove the '[]' + * - ssize_t, number of bytes that were stripped from 'value' to remove the '[]' * enclosed cmd and its arguments, including any subsequent * whitespace characters. I.e. if 'value' is "[cmd] BTN_RIGHT", the * return value is 6 (strlen("[cmd] ")). * - cmd: allocated string containing "cmd arg1 arg2...". Caller frees. - * - argv: allocatd array containing {"cmd", "arg1", "arg2", NULL}. Caller frees. + * - argv: allocated array containing {"cmd", "arg1", "arg2", NULL}. Caller frees. */ static ssize_t pipe_argv_from_value(struct context *ctx, char ***argv) @@ -1727,8 +1727,6 @@ parse_key_binding_section(struct context *ctx, if (pipe_remove_len < 0) return false; - ctx->value += pipe_remove_len; - for (int action = 0; action < action_count; action++) { if (action_map[action] == NULL) continue; @@ -2105,8 +2103,6 @@ parse_section_mouse_bindings(struct context *ctx) if (pipe_remove_len < 0) return false; - value += pipe_remove_len; - for (enum bind_action_normal action = 0; action < BIND_ACTION_COUNT; action++) |
