From: Florian Forster <octo@collectd.org>
Date: Thu, 7 Feb 2019 10:33:16 +0000 (+0100)
Subject: strjoin(): Fix behavior if output buffer is NULL.
X-Git-Tag: collectd-5.9.0~52^2^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3063%2Fhead;p=thirdparty%2Fcollectd.git

strjoin(): Fix behavior if output buffer is NULL.

Additionally, test the (NULL, 0) output buffer for all test cases rather
than an individual, isolated test case.

Fixes: #3062
---

diff --git a/src/daemon/common.c b/src/daemon/common.c
index ec5c7abab..8502208de 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -352,6 +352,9 @@ int strjoin(char *buffer, size_t buffer_size, char **fields, size_t fields_num,
       buffer_req += sep_len;
     buffer_req += field_len;
 
+    if (buffer_size == 0)
+      continue;
+
     if ((i != 0) && (sep_len > 0)) {
       if (sep_len >= avail) {
         /* prevent subsequent iterations from writing to the
diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c
index 0c96945f4..7a9f91428 100644
--- a/src/daemon/common_test.c
+++ b/src/daemon/common_test.c
@@ -185,10 +185,12 @@ DEF_TEST(strjoin) {
                      cases[i].fields_num, cases[i].separator);
     EXPECT_EQ_INT(cases[i].want_return, status);
     EXPECT_EQ_STR(cases[i].want_buffer, buffer);
-  }
 
-  /* use (NULL, 0) to determine required buffer size. */
-  EXPECT_EQ_INT(3, strjoin(NULL, 0, (char *[]){"a", "b"}, 2, "-"));
+    /* use (NULL, 0) to determine required buffer size. */
+    EXPECT_EQ_INT(cases[i].want_return,
+                  strjoin(NULL, 0, cases[i].fields, cases[i].fields_num,
+                          cases[i].separator));
+  }
 
   return (0);
 }