From ea1c9d3f69f41c86a55e40e110d394769f5803f3 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 29 Jan 2022 22:34:02 +0100 Subject: [PATCH 1/2] fstab-generator: use str(n)dupa_safe() instead of plain str(n)dupa() --- src/fstab-generator/fstab-generator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 9b32383a76..ca9b045e85 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -721,7 +721,7 @@ static int sysroot_is_nfsroot(void) { if (!sep) return -EINVAL; - a = strndupa(arg_root_what + 1, sep - arg_root_what - 1); + a = strndupa_safe(arg_root_what + 1, sep - arg_root_what - 1); r = in_addr_from_string(AF_INET6, a, &u); if (r < 0) @@ -733,7 +733,7 @@ static int sysroot_is_nfsroot(void) { /* IPv4 address */ sep = strchr(arg_root_what, ':'); if (sep) { - a = strndupa(arg_root_what, sep - arg_root_what); + a = strndupa_safe(arg_root_what, sep - arg_root_what); if (in_addr_from_string(AF_INET, a, &u) >= 0) return true; From a79da8b3c753513afe1831fee4bbf28581c82799 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sat, 29 Jan 2022 22:36:29 +0100 Subject: [PATCH 2/2] test: make use of strv_isempty() --- src/test/test-load-fragment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 68172be43e..9e5ae85597 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -803,7 +803,7 @@ TEST(config_parse_unit_env_file) { "EnvironmentFile", 0, "not-absolute", &files, u); assert_se(r == 0); - assert_se(strv_length(files) == 0); + assert_se(strv_isempty(files)); r = config_parse_unit_env_file(u->id, "fake", 1, "section", 1, "EnvironmentFile", 0, "/absolute1",