SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locale: do not use alloca() for strings which can be potentially arbitrary

Browse Source
This commit is contained in:
Yu Watanabe
2023-01-23 11:29:11 +00:00
committed by Luca Boccassi
parent 76400a623f
commit 6f4514e84a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locale/localed-util.c
+13 -6
View File
@@ -563,17 +563,24 @@ int find_legacy_keymap(Context *c, char **ret) {
}
}
if (best_matching < 10 && c->x11_layout) {
if (best_matching < 10 && !isempty(c->x11_layout)) {
_cleanup_free_ char *l = NULL, *v = NULL, *converted = NULL;
/* The best match is only the first part of the X11
* keymap. Check if we have a converted map which
* matches just the first layout.
*/
char *l, *v = NULL, *converted;
l = strndupa_safe(c->x11_layout, strcspn(c->x11_layout, ","));
if (c->x11_variant)
v = strndupa_safe(c->x11_variant,
strcspn(c->x11_variant, ","));
l = strndup(c->x11_layout, strcspn(c->x11_layout, ","));
if (!l)
return -ENOMEM;
if (!isempty(c->x11_variant)) {
v = strndup(c->x11_variant, strcspn(c->x11_variant, ","));
if (!v)
return -ENOMEM;
}
r = find_converted_keymap(l, v, &converted);
if (r < 0)
return r;