Merge pull request #2741 from ktsaou/master

escape invalid characters from chart parameters

2 files changed, 17 insertions, 3 deletions

diff --git a/src/common.c b/src/common.c
index aa75c198d2..5a953672d0 100644
--- a/src/common.c
+++ b/src/common.c
@@ -227,9 +227,18 @@ void json_escape_string(char *dst, const char *src, size_t size) {
 }
 
 void json_fix_string(char *s) {
-    for( ; *s ;s++) {
-        if(unlikely(*s == '\\')) *s = '/';
-        else if(unlikely(*s == '"')) *s = '\'';
+    unsigned char c;
+    while((c = (unsigned char)*s)) {
+        if(unlikely(c == '\\'))
+            *s++ = '/';
+        else if(unlikely(c == '"'))
+            *s++ = '\'';
+        else if(unlikely(isspace(c) || iscntrl(c)))
+            *s++ = ' ';
+        else if(unlikely(!isprint(c) || c > 127))
+            *s++ = '_';
+        else
+            s++;
     }
 }
 
diff --git a/src/rrdset.c b/src/rrdset.c
index caa427ff6f..c5168f02ed 100644
--- a/src/rrdset.c
+++ b/src/rrdset.c
@@ -582,10 +582,15 @@ RRDSET *rrdset_create_custom(
 
     st->chart_type = rrdset_type_id(config_get(st->config_section, "chart type", rrdset_type_name(chart_type)));
     st->type       = config_get(st->config_section, "type", type);
+
     st->family     = config_get(st->config_section, "family", family?family:st->type);
+    json_fix_string(st->family);
+
     st->units      = config_get(st->config_section, "units", units?units:"");
+    json_fix_string(st->units);
 
     st->context    = config_get(st->config_section, "context", context?context:st->id);
+    json_fix_string(st->context);
     st->hash_context = simple_hash(st->context);
 
     st->priority = config_get_number(st->config_section, "priority", priority);