Merge branch 'collectd-5.3' into collectd-5.4

[collectd.git] / src / curl_json.c

diff --git a/src/curl_json.c b/src/curl_json.c
index 6c7cf8d..1ef8a26 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -53,10 +53,10 @@ struct cj_key_s;
 typedef struct cj_key_s cj_key_t;
 struct cj_key_s /* {{{ */
 {
+  unsigned long magic;
   char *path;
   char *type;
   char *instance;
-  unsigned long magic;
 };
 /* }}} */
 
@@ -549,6 +549,7 @@ static int cj_config_add_key (cj_t *db, /* {{{ */
         len = ptr-name;
         if (len == 0)
           break;
+        len = COUCH_MIN(len, sizeof (ent)-1);
         sstrncpy (ent, name, len+1);
 
         if (c_avl_get (tree, ent, (void *) &value) != 0)