X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenvpn.c;h=a36de9d0160524b056e1df8cd45d155f5de2b80e;hb=c21ce3b44f63d706b8b200a88047db74f1a51392;hp=663a82d8fd9221fd6b138361efb03b340dc3666f;hpb=9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0;p=collectd.git

diff --git a/src/openvpn.c b/src/openvpn.c
index 663a82d8..a36de9d0 100644
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -525,8 +525,6 @@ static int openvpn_read (void)
 	/* call the right read function for every status entry in the list */
 	for (i = 0; i < vpn_num; i++)
 	{
-		int vpn_read = 0;
-
 		fh = fopen (vpn_list[i]->file, "r");
 		if (fh == NULL)
 		{
@@ -697,6 +695,14 @@ static int openvpn_config (const char *key, const char *value)
 
 		/* create a new vpn element since file, version and name are ok */
 		temp = (vpn_status_t *) malloc (sizeof (vpn_status_t));
+		if (temp == NULL)
+		{
+			char errbuf[1024];
+			ERROR ("openvpn plugin: malloc failed: %s",
+					sstrerror (errno, errbuf, sizeof (errbuf)));
+			sfree (status_file);
+			return (1);
+		}
 		temp->file = status_file;
 		temp->version = status_version;
 		temp->name = status_name;
@@ -705,7 +711,7 @@ static int openvpn_config (const char *key, const char *value)
 		if (vpn_list == NULL)
 		{
 			char errbuf[1024];
-			ERROR ("openvpn plugin: malloc failed: %s",
+			ERROR ("openvpn plugin: realloc failed: %s",
 					sstrerror (errno, errbuf, sizeof (errbuf)));
 
 			sfree (temp->file);