X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Fcommon.c;h=eb9f590ad7317f953218926743b0faa7fe8f6ceb;hp=cf981dc0a3d8b03b0022bf997f430115e7d4cc47;hb=da11ce02eb202b3e01d3e2d1b40f248a84430973;hpb=d5456237d0de8f9905ea7a32f2bbae52b5e3ea73

diff --git a/src/daemon/common.c b/src/daemon/common.c
index cf981dc0..eb9f590a 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -60,6 +60,10 @@
 #include <sys/capability.h>
 #endif
 
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
+
 #ifdef HAVE_LIBKSTAT
 extern kstat_ctl_t *kc;
 #endif
@@ -334,6 +338,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