mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-20 05:33:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: parse_key_binding_section(): use provided action-map

Browse source 
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”.
This commit is contained in:
Daniel Eklöf 2021-04-05 14:33:44 +02:00
parent 6e782271ff
commit 5dbeb5ce27
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -37,6 +37,8 @@
* Crash caused by a double free originating in `XTSMGRAPHICS` - set * Crash caused by a double free originating in `XTSMGRAPHICS` - set
number of color registers number of color registers
(https://codeberg.org/dnkl/foot/issues/427). (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 ### Security

2
config.c
View file

@ -1393,7 +1393,7 @@ parse_key_binding_section(
if (!parse_key_combos( if (!parse_key_combos(
conf, value, &key_combos, section, key, path, lineno) || conf, value, &key_combos, section, key, path, lineno) ||
has_key_binding_collisions( has_key_binding_collisions(
conf, action, binding_action_map, bindings, &key_combos, conf, action, action_map, bindings, &key_combos,
path, lineno)) path, lineno))
{ {
free(pipe_argv); free(pipe_argv);