diff options
| author |   Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-01-30 09:34:44 +0900 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2022-01-30 09:34:44 +0900 |
| commit | b97f338e5615f54bbc6970354175ec5e636fab46 (patch) | |
| tree | f6563d71f7dd3f73113a4f66f3014cac16902ff3 | |
| parent | ci: update GHActions once a month (diff) | |
| parent | test: make use of strv_isempty() (diff) | |
| download | systemd-b97f338e5615f54bbc6970354175ec5e636fab46.tar.xz systemd-b97f338e5615f54bbc6970354175ec5e636fab46.zip | |
Merge pull request #22301 from mrc0mmand/cocci-tweaks
fstab-generator: use str(n)dupa_safe() instead of plain str(n)dupa()
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 4 | ||||
| -rw-r--r-- | src/test/test-load-fragment.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 9b32383a766..ca9b045e859 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; diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 68172be43e4..9e5ae855976 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", |