aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-18 20:15:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-18 20:15:22 +0000
commit59b5ba03c74fdc2c9df53c0ff79996c9d51dad74 (patch)
tree74aebf1d1e20f5afeb91258e6d7b65ecd25afd46
parentMerge branch 'shm-buffer-busy-sometimes-not-set' (diff)
parenttest: config: verify setting an empty key/mouse binding fails (diff)
Merge branch 'error-on-empty-key-or-mouse-binding'
Closes #851
-rw-r--r--CHANGELOG.md2
-rw-r--r--config.c6
-rw-r--r--tests/test-config.c14
3 files changed, 18 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1904fd5d..9a972955 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,8 @@
CSI codes in the Kitty keyboard protocol.
* Assertion in `shm.c:buffer_release()`
(https://codeberg.org/dnkl/foot/issues/844).
+* Crash when setting a key- or mouse binding to the empty string
+ (https://codeberg.org/dnkl/foot/issues/851).
### Security
diff --git a/config.c b/config.c
index 50fb74e6..2b7ad378 100644
--- a/config.c
+++ b/config.c
@@ -1726,6 +1726,12 @@ value_to_key_combos(struct context *ctx, int action, struct argv *argv,
}
+ if (idx == 0) {
+ LOG_CONTEXTUAL_ERR(
+ "empty binding not allowed (set to 'none' to unmap)");
+ goto err;
+ }
+
remove_from_key_bindings_list(bindings, action, argv);
bindings->arr = xrealloc(
diff --git a/tests/test-config.c b/tests/test-config.c
index 1e99b3c4..6a2edcb8 100644
--- a/tests/test-config.c
+++ b/tests/test-config.c
@@ -296,7 +296,16 @@ test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx),
const int click_count = action % 3 + 1;
/* Finally, generate the ‘value’ (e.g. “Control+shift+x”) */
- char value[128];
+ char value[128] = {0};
+
+ ctx->key = key;
+ ctx->value = value;
+
+ /* First, try setting the empty string */
+ if (parse_fun(ctx)) {
+ BUG("[%s].%s=<empty>: did not fail to parse as expected",
+ ctx->section, ctx->key);
+ }
switch (type) {
case KEY_BINDING: {
@@ -319,9 +328,6 @@ test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx),
}
}
- ctx->key = key;
- ctx->value = value;
-
if (!parse_fun(ctx)) {
BUG("[%s].%s=%s failed to parse",
ctx->section, ctx->key, ctx->value);