From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 11 Jan 2011 08:06:58 +0000 (+0100)
Subject: src/plugin.c: Free allocated data if plugin_insert_read() fails.
X-Git-Tag: collectd-5.0.0~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a06c1a5201303c3b0bd0c330d733916cbf20d568;p=collectd.git

src/plugin.c: Free allocated data if plugin_insert_read() fails.
---

diff --git a/src/plugin.c b/src/plugin.c
index eb98a7a3..9ecee5cf 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -767,14 +767,13 @@ int plugin_register_read (const char *name,
 		int (*callback) (void))
 {
 	read_func_t *rf;
+	int status;
 
-	rf = (read_func_t *) malloc (sizeof (read_func_t));
+	rf = malloc (sizeof (*rf));
 	if (rf == NULL)
 	{
-		char errbuf[1024];
-		ERROR ("plugin_register_read: malloc failed: %s",
-				sstrerror (errno, errbuf, sizeof (errbuf)));
-		return (-1);
+		ERROR ("plugin_register_read: malloc failed.");
+		return (ENOMEM);
 	}
 
 	memset (rf, 0, sizeof (read_func_t));
@@ -788,7 +787,11 @@ int plugin_register_read (const char *name,
 	rf->rf_interval.tv_nsec = 0;
 	rf->rf_effective_interval = rf->rf_interval;
 
-	return (plugin_insert_read (rf));
+	status = plugin_insert_read (rf);
+	if (status != 0)
+		sfree (rf);
+
+	return (status);
 } /* int plugin_register_read */
 
 int plugin_register_complex_read (const char *group, const char *name,
@@ -797,12 +800,13 @@ int plugin_register_complex_read (const char *group, const char *name,
 		user_data_t *user_data)
 {
 	read_func_t *rf;
+	int status;
 
-	rf = (read_func_t *) malloc (sizeof (read_func_t));
+	rf = malloc (sizeof (*rf));
 	if (rf == NULL)
 	{
 		ERROR ("plugin_register_complex_read: malloc failed.");
-		return (-1);
+		return (ENOMEM);
 	}
 
 	memset (rf, 0, sizeof (read_func_t));
@@ -830,7 +834,11 @@ int plugin_register_complex_read (const char *group, const char *name,
 		rf->rf_udata = *user_data;
 	}
 
-	return (plugin_insert_read (rf));
+	status = plugin_insert_read (rf);
+	if (status != 0)
+		sfree (rf);
+
+	return (status);
 } /* int plugin_register_complex_read */
 
 int plugin_register_write (const char *name,
diff --git a/src/plugin.h b/src/plugin.h
index 937eebed..4d5201b6 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -269,6 +269,8 @@ int plugin_register_init (const char *name,
 		plugin_init_cb callback);
 int plugin_register_read (const char *name,
 		int (*callback) (void));
+/* "user_data" will be freed automatically, unless
+ * "plugin_register_complex_read" returns an error (non-zero). */
 int plugin_register_complex_read (const char *group, const char *name,
 		plugin_read_cb callback,
 		const struct timespec *interval,