X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcommon.c;h=142d7979adf1fc2c02e6a54d9a4bdc8483598c4e;hp=7813d5bbf3baede0a499e1c4b3b0dee7f47ef315;hb=c9827c15fc557d7c9201f925f406023d660478eb;hpb=c0be68f50b78729393d9a020413ea5789a709d61

diff --git a/src/common.c b/src/common.c
index 7813d5bb..142d7979 100644
--- a/src/common.c
+++ b/src/common.c
@@ -941,9 +941,13 @@ int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */
 
 	sstrncpy (vl->host, host, sizeof (host));
 	sstrncpy (vl->plugin, plugin, sizeof (plugin));
-	sstrncpy (vl->plugin_instance, plugin_instance, sizeof (plugin_instance));
+	sstrncpy (vl->plugin_instance,
+			(plugin_instance != NULL) ? plugin_instance : "",
+			sizeof (plugin_instance));
 	sstrncpy (vl->type, type, sizeof (type));
-	sstrncpy (vl->type_instance, type_instance, sizeof (type_instance));
+	sstrncpy (vl->type_instance,
+			(type_instance != NULL) ? type_instance : "",
+			sizeof (type_instance));
 
 	return (0);
 } /* }}} int parse_identifier_vl */