Merge branch 'collectd-5.8'

diff --git a/contrib/format.sh b/contrib/format.sh
index ea1ed01..18fac0a 100755 (executable)
--- a/contrib/format.sh
+++ b/contrib/format.sh
@@ -13,7 +13,7 @@ for i in "$@"; do
   d="`dirname "${i}"`"
   o="`TMPDIR="${d}" mktemp format.XXXXXX`"
 
-  curl --silent --data-binary "@-" https://clang-format.appspot.com/ <"${i}" >"${o}"
+  curl --silent --data-binary "@-" https://format.collectd.org/ <"${i}" >"${o}"
   if test $? -eq 0; then
     cat "${o}" >"${i}"
   fi

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 65725f8..8856369 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -794,7 +794,7 @@ static int rrd_write(const data_set_t *ds, const value_list_t *vl,
   if (value_list_to_filename(filename, sizeof(filename), vl) != 0)
     return -1;
 
-  char values[32 * ds->ds_num];
+  char values[32 * (ds->ds_num + 1)];
   if (value_list_to_string(values, sizeof(values), ds, vl) != 0)
     return -1;