From 2f82562bad423d1190912a4b209647dfac966db2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Oct 2021 12:38:37 +0200 Subject: alloc-util: add strdupa_safe() + strndupa_safe() and use it everywhere Let's define two helpers strdupa_safe() + strndupa_safe() which do the same as their non-safe counterparts, except that they abort if called with allocations larger than ALLOCA_MAX. This should ensure that all our alloca() based allocations are subject to this limit. afaics glibc offers three alloca() based APIs: alloca() itself, strndupa() + strdupa(). With this we have now replacements for all of them, that take the limit into account. --- src/locale/keymap-util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/locale') diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c index 32af23d692..1bd8f5c0ae 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -648,9 +648,10 @@ int find_legacy_keymap(Context *c, char **ret) { */ char *l, *v = NULL, *converted; - l = strndupa(c->x11_layout, strcspn(c->x11_layout, ",")); + l = strndupa_safe(c->x11_layout, strcspn(c->x11_layout, ",")); if (c->x11_variant) - v = strndupa(c->x11_variant, strcspn(c->x11_variant, ",")); + v = strndupa_safe(c->x11_variant, + strcspn(c->x11_variant, ",")); r = find_converted_keymap(l, v, &converted); if (r < 0) return r; -- cgit v1.2.1