p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix undefined behaviour

This commit is contained in:
Přemysl Eric Janouch 2018-07-21 23:36:13 +02:00
parent 68c620fdee
commit 9b38c4c74f
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nncmpp.c
View File

@ -2211,12 +2211,15 @@ app_init_bindings (const char *keymap,
ARRAY (struct binding, a) ARRAY (struct binding, a)
ARRAY_INIT_SIZED (a, defaults_len); ARRAY_INIT_SIZED (a, defaults_len);
// Order for stable sorting
size_t order = 0;
termo_key_t decoded; termo_key_t decoded;
for (size_t i = 0; i < defaults_len; i++) for (size_t i = 0; i < defaults_len; i++)
{ {
hard_assert (!*termo_strpkey_utf8 (g.tk, hard_assert (!*termo_strpkey_utf8 (g.tk,
defaults[i].key, &decoded, TERMO_FORMAT_ALTISMETA)); defaults[i].key, &decoded, TERMO_FORMAT_ALTISMETA));
a[a_len++] = (struct binding) { decoded, defaults[i].action, a_len }; a[a_len++] = (struct binding) { decoded, defaults[i].action, order++ };
} }
struct config_item *root = config_item_get (g.config.root, keymap, NULL); struct config_item *root = config_item_get (g.config.root, keymap, NULL);
@ -2227,7 +2230,7 @@ app_init_bindings (const char *keymap,
int action; int action;
while (app_next_binding (&iter, &decoded, &action)) while (app_next_binding (&iter, &decoded, &action))
a[a_len++] = (struct binding) { decoded, action, a_len }; a[a_len++] = (struct binding) { decoded, action, order++ };
} }
// Use the helper field to use the last mappings of identical bindings // Use the helper field to use the last mappings of identical bindings