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

Merge pull request #20256 from keszybz/one-alloca-too-many

Browse Source 
basic/unit-name: do not use strdupa() on a path
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-07-20 14:39:23 +02:00
committed by GitHub
parent 30c9faff0d 4e2544c30b
commit b34a4f0e67
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/unit-name.c
+7 -10
View File
@@ -378,12 +378,13 @@ int unit_name_unescape(const char *f, char **ret) {
}
int unit_name_path_escape(const char *f, char **ret) {
char *p, *s;
_cleanup_free_ char *p = NULL;
char *s;
assert(f);
assert(ret);
p = strdupa(f);
p = strdup(f);
if (!p)
return -ENOMEM;
@@ -395,13 +396,9 @@ int unit_name_path_escape(const char *f, char **ret) {
if (!path_is_normalized(p))
return -EINVAL;
/* Truncate trailing slashes */
/* Truncate trailing slashes and skip leading slashes */
delete_trailing_chars(p, "/");
/* Truncate leading slashes */
p = skip_leading_chars(p, "/");
s = unit_name_escape(p);
s = unit_name_escape(skip_leading_chars(p, "/"));
}
if (!s)
return -ENOMEM;
@@ -531,7 +528,7 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) {
if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */
return -ENAMETOOLONG;
/* Refuse this if this got too long or for some other reason didn't result in a valid name */
/* Refuse if this for some other reason didn't result in a valid name */
if (!unit_name_is_valid(s, UNIT_NAME_PLAIN))
return -EINVAL;
@@ -565,7 +562,7 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha
if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */
return -ENAMETOOLONG;
/* Refuse this if this got too long or for some other reason didn't result in a valid name */
/* Refuse if this for some other reason didn't result in a valid name */
if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE))
return -EINVAL;