detect if slaves or plugins send invalid titles and units; fixes #2559
Costa Tsaousis (ktsaou) committed
Aug 7, 2017 at 15:03 UTC
534bf43dc8f8f55d381931235bb1845efabb547d
1 file changed
+4
-2
src/plugins_d.c
+4
-2
@@ -246,10 +246,10 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int
246
}
247
248
int priority = 1000;
249
- if(likely(priority_s)) priority = str2i(priority_s);
249
+ if(likely(priority_s && *priority_s)) priority = str2i(priority_s);
250
251
int update_every = cd->update_every;
252
- if(likely(update_every_s)) update_every = str2i(update_every_s);
252
+ if(likely(update_every_s && *update_every_s)) update_every = str2i(update_every_s);
253
if(unlikely(!update_every)) update_every = cd->update_every;
254
255
RRDSET_TYPE chart_type = RRDSET_TYPE_LINE;
@@ -258,6 +258,8 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int
258
if(unlikely(noname || !name || !*name || strcasecmp(name, "NULL") == 0 || strcasecmp(name, "(NULL)") == 0)) name = NULL;
259
if(unlikely(!family || !*family)) family = NULL;
260
if(unlikely(!context || !*context)) context = NULL;
261
+ if(unlikely(!title)) title = "";
262
+ if(unlikely(!units)) units = "unknown";
263
264
st = rrdset_find_bytype(host, type, id);
265
if(unlikely(!st)) {