Merge branch 'collectd-5.8'

[collectd.git] / src / daemon / common.c

diff --git a/src/daemon/common.c b/src/daemon/common.c
index 1775573..b5a1c98 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -339,6 +339,9 @@ int strjoin(char *buffer, size_t buffer_size, char **fields, size_t fields_num,
       buffer_req += sep_len;
     buffer_req += field_len;
 
       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
     if ((i != 0) && (sep_len > 0)) {
       if (sep_len >= avail) {
         /* prevent subsequent iterations from writing to the