basic/strv: add an extra NUL after strings in strv_make_nulstr

[thirdparty/systemd.git] / src / test / test-strv.c

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index cf5887d25869760c9f9e72b95807f1e658d2bcc7..841a36782f4f6a080195b518a447943b45cc01af 100644 (file)
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -647,7 +647,9 @@ static void test_strv_extend_n(void) {
 static void test_strv_make_nulstr_one(char **l) {
         _cleanup_free_ char *b = NULL, *c = NULL;
         _cleanup_strv_free_ char **q = NULL;
+        const char *s = NULL;
         size_t n, m;
+        unsigned i = 0;
 
         assert_se(strv_make_nulstr(l, &b, &n) >= 0);
         assert_se(q = strv_parse_nulstr(b, n));
@@ -656,6 +658,10 @@ static void test_strv_make_nulstr_one(char **l) {
         assert_se(strv_make_nulstr(q, &c, &m) >= 0);
         assert_se(m == n);
         assert_se(memcmp(b, c, m) == 0);
+
+        NULSTR_FOREACH(s, b)
+                assert_se(streq(s, l[i++]));
+        assert_se(i == strv_length(l));
 }
 
 static void test_strv_make_nulstr(void) {
@@ -686,7 +692,7 @@ static void test_foreach_string(void) {
 }
 
 static void test_strv_fnmatch(void) {
-        _cleanup_free_ char **v = NULL;
+        _cleanup_strv_free_ char **v = NULL;
 
         assert_se(!strv_fnmatch(STRV_MAKE_EMPTY, "a", 0));