X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=da662040cecedc916b5709fefdeae6b8ae6a5b49;hb=1fdb04e6cb573ad06b914b9371f21ffb255b1d13;hp=64dbf7805c92cccef4113bdadac24e928b332b45;hpb=348fa70f34d7e32fafebb82053e0c84625c2ba67;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 64dbf780..da662040 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -607,13 +607,18 @@ void plugin_shutdown_all (void)
 	while (le != NULL)
 	{
 		callback = (int (*) (void)) le->value;
-		(*callback) ();
 
+		/* Advance the pointer before calling the callback allows
+		 * shutdown functions to unregister themselves. If done the
+		 * other way around the memory `le' points to will be freed
+		 * after callback returns. */
 		le = le->next;
+
+		(*callback) ();
 	}
 } /* void plugin_shutdown_all */
 
-int plugin_dispatch_values (const char *name, const value_list_t *vl)
+int plugin_dispatch_values (const char *name, value_list_t *vl)
 {
 	int (*callback) (const data_set_t *, const value_list_t *);
 	data_set_t *ds;
@@ -650,6 +655,11 @@ int plugin_dispatch_values (const char *name, const value_list_t *vl)
 	}
 #endif
 
+	escape_slashes (vl->host, sizeof (vl->host));
+	escape_slashes (vl->plugin, sizeof (vl->plugin));
+	escape_slashes (vl->plugin_instance, sizeof (vl->plugin_instance));
+	escape_slashes (vl->type_instance, sizeof (vl->type_instance));
+
 	le = llist_head (list_write);
 	while (le != NULL)
 	{
@@ -660,7 +670,7 @@ int plugin_dispatch_values (const char *name, const value_list_t *vl)
 	}
 
 	return (0);
-}
+} /* int plugin_dispatch_values */
 
 void plugin_log (int level, const char *format, ...)
 {