nulstr-util: fix corner cases of strv_make_nulstr()

Let's change the return semantics of strv_make_nulstr() so that we can
properly distuingish the case where we have a no entries in the nulstr
from the case where we have a single empty string in a nulstr.

Previously we couldn't distuingish those, we'd in both cases return a
size of zero, and a buffer with two NUL bytes.

With this change, we'll still return a buffer with two NULL bytes, but
for the case where no entries are defined we'll return a size of zero,
and where we have two a size of one.

This is a good idea, as it makes sure we can properly handle all corner
cases.

Nowadays the function is used by one place only: ask-password-api.c. The
corner case never mattered there, since it was used to serialize
passwords, and it was known that there was exactly one password, not
less. But let's clean this up. This means the subtraction of the final
NUL byte now happens in ask-password-api.c instead.

diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
index 67226d208c284608a4123bb6a932cf84e9d0c282..44b88ca75353f9b043ff043f34884e03ebd66c20 100644 (file)
--- a/src/basic/nulstr-util.c
+++ b/src/basic/nulstr-util.c
@@ -70,10 +70,15 @@ char** strv_split_nulstr(const char *s) {
 }
 
 int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
-        /* A valid nulstr with two NULs at the end will be created, but q will be the length without the two
-         * trailing NULs. Thus the output string is a valid nulstr and can be iterated over using
-         * NULSTR_FOREACH(), and can also be parsed by strv_parse_nulstr() as long as the length is provided
-         * separately. */
+        /* Builds a nulstr and returns it together with the size. An extra NUL byte will be appended (⚠️ but
+         * not included in the size! ⚠️). This is done so that the nulstr can be used both in
+         * strv_parse_nulstr() and in NULSTR_FOREACH()/strv_split_nulstr() contexts, i.e. with and without a
+         * size parameter. In the former case we can include empty strings, in the latter case we cannot (as
+         * that is the end marker).
+         *
+         * When NULSTR_FOREACH()/strv_split_nulstr() is used it is often assumed that the nulstr ends in two
+         * NUL bytes (which it will, if not empty). To ensure that this assumption *always* holds, we'll
+         * return a buffer with two NUL bytes in that case, but return a size of zero. */
 
         _cleanup_free_ char *m = NULL;
         size_t n = 0;
@@ -94,17 +99,18 @@ int strv_make_nulstr(char * const *l, char **ret, size_t *ret_size) {
         }
 
         if (!m) {
+                /* return a buffer with an extra NUL, so that the assumption that we always have two trailing NULs holds */
                 m = new0(char, 2);
                 if (!m)
                         return -ENOMEM;
-                n = 1;
+
+                n = 0;
         } else
-                /* make sure there is a second extra NUL at the end of resulting nulstr */
+                /* Make sure there is a second extra NUL at the end of resulting nulstr (not counted in return size) */
                 m[n] = '\0';
 
-        assert(n > 0);
         *ret = TAKE_PTR(m);
-        *ret_size = n - 1;
+        *ret_size = n;
 
         return 0;
 }

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index e0488ff1940369306f332231f0b7d5b107781758..e7db23c2017bef81ae881d71c99e7dbaf4c92ca1 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -113,6 +113,10 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa
         if (r < 0)
                 return r;
 
+        /* chop off the final NUL byte. We do this because we want to use the separator NUL bytes only if we
+         * have multiple passwords. */
+        n = LESS_BY(n, (size_t) 1);
+
         serial = add_key("user", keyname, p, n, KEY_SPEC_USER_KEYRING);
         if (serial == -1)
                 return -errno;