aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-04-05 12:33:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-18 18:07:05 +0000
commit5dbeb5ce274df5649b2e475a7b181c03c26b38b6 (patch)
tree928769509a95deea8ddb3c0004fef73a694d7acf
parentsixel: fix double free caused by bad free() in sixel_colors_set() (diff)
config: parse_key_binding_section(): use provided action-map
Don’t call has_key_binding_collisions() with ‘binding_action_map’ unconditionally; use the provided ‘action_map’ instead. This fixes wrong error messages for key combo collisions in key binding sections other than the regular “key-bindings”.
-rw-r--r--CHANGELOG.md2
-rw-r--r--config.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b5f9c3..970c070b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,8 @@
* Crash caused by a double free originating in `XTSMGRAPHICS` - set
number of color registers
(https://codeberg.org/dnkl/foot/issues/427).
+* Wrong action referenced in error message for key binding collisions
+ (https://codeberg.org/dnkl/foot/issues/432).
### Security
diff --git a/config.c b/config.c
index ab0236bb..0112b9e4 100644
--- a/config.c
+++ b/config.c
@@ -1393,7 +1393,7 @@ parse_key_binding_section(
if (!parse_key_combos(
conf, value, &key_combos, section, key, path, lineno) ||
has_key_binding_collisions(
- conf, action, binding_action_map, bindings, &key_combos,
+ conf, action, action_map, bindings, &key_combos,
path, lineno))
{
free(pipe_argv);