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

config: on error, correctly free partially parsed key combos

Browse source
This commit is contained in:
Daniel Eklöf 2024-02-20 16:17:52 +01:00
parent d31ccf12d0
commit 678bdb7c3f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config.c
View file

@ -1716,7 +1716,7 @@ value_to_key_combos(struct context *ctx, int action,
/* Count number of combinations */ /* Count number of combinations */
size_t combo_count = 1; size_t combo_count = 1;
size_t used_combos = 0; /* For error handling */ size_t used_combos = 1; /* For error handling */
for (const char *p = strchr(ctx->value, ' '); for (const char *p = strchr(ctx->value, ' ');
p != NULL; p != NULL;
p = strchr(p + 1, ' ')) p = strchr(p + 1, ' '))
@ -1764,7 +1764,6 @@ value_to_key_combos(struct context *ctx, int action,
new_combo->k.sym = xkb_keysym_from_name(key, 0); new_combo->k.sym = xkb_keysym_from_name(key, 0);
if (new_combo->k.sym == XKB_KEY_NoSymbol) { if (new_combo->k.sym == XKB_KEY_NoSymbol) {
LOG_CONTEXTUAL_ERR("not a valid XKB key name: %s", key); LOG_CONTEXTUAL_ERR("not a valid XKB key name: %s", key);
free_key_binding(new_combo);
goto err; goto err;
} }
break; break;
@ -1785,7 +1784,6 @@ value_to_key_combos(struct context *ctx, int action,
LOG_CONTEXTUAL_ERRNO("invalid click count: %s", _count); LOG_CONTEXTUAL_ERRNO("invalid click count: %s", _count);
else else
LOG_CONTEXTUAL_ERR("invalid click count: %s", _count); LOG_CONTEXTUAL_ERR("invalid click count: %s", _count);
free_key_binding(new_combo);
goto err; goto err;
} }
@ -1795,7 +1793,6 @@ value_to_key_combos(struct context *ctx, int action,
new_combo->m.button = mouse_button_name_to_code(key); new_combo->m.button = mouse_button_name_to_code(key);
if (new_combo->m.button < 0) { if (new_combo->m.button < 0) {
LOG_CONTEXTUAL_ERR("invalid mouse button name: %s", key); LOG_CONTEXTUAL_ERR("invalid mouse button name: %s", key);
free_key_binding(new_combo);
goto err; goto err;
} }
@ -2390,7 +2387,7 @@ parse_section_text_bindings(struct context *ctx)
struct binding_aux aux = { struct binding_aux aux = {
.type = BINDING_AUX_TEXT, .type = BINDING_AUX_TEXT,
.text = { .text = {
.data = data, .data = data, /* data is now owned by value_to_key_combos() */
.len = data_len, .len = data_len,
}, },
}; };
@ -2398,7 +2395,8 @@ parse_section_text_bindings(struct context *ctx)
if (!value_to_key_combos(ctx, BIND_ACTION_TEXT_BINDING, &aux, if (!value_to_key_combos(ctx, BIND_ACTION_TEXT_BINDING, &aux,
&conf->bindings.key, KEY_BINDING)) &conf->bindings.key, KEY_BINDING))
{ {
goto err; /* Do *not* free(data) - it is handled by value_to_key_combos() */
return false;
} }
return true; return true;