Added freeing of runvpn memory if not run with any arguments.

kse · Jun 10, 2011 · 74ed3c7 · 74ed3c7
1 parent c77a6d3
commit 74ed3c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/runvpn.c b/src/runvpn.c
@@ -52,6 +52,7 @@ main(int argc, char *argv[])
 {
 	const char *root_folder = getenv("runvpn_root");
 	struct vpn *vpn = NULL;
+	struct vpn *prev = NULL;
 
 	if (root_folder == NULL) {
 		printf("Environment variable \"runvpn_root\" is not defined.\n");
@@ -62,7 +63,10 @@ main(int argc, char *argv[])
 		/* fprintf(stdout, "%30s%s%s\n", BLUE_GRAY, "Listing VPNS", RESET); */
 		puts("                    " BLUE_GRAY "Listing VPNS" RESET);
 
-		for (vpn = get_vpns(root_folder); vpn; vpn = vpn->next) {
+		vpn = get_vpns(root_folder);
+		while(vpn != NULL)
+		{
+			//for (vpn = get_vpns(root_folder); vpn; vpn = vpn->next) {
 			fprintf(stdout, "%25s - ", vpn->name);
 
 			switch (vpn_status(vpn)) {
@@ -91,6 +95,12 @@ main(int argc, char *argv[])
 				print_color("Unknown", RED);
 				break;
 			}
+
+			prev = vpn;
+			vpn = prev->next;
+
+			vpn_free(prev);
+			free(prev);
 		}
 
 	} else if (argc == 2) {

diff --git a/src/vpn.c b/src/vpn.c
@@ -22,7 +22,7 @@ vpn_free(struct vpn *vpn)
     free(vpn->config);
     free(vpn->log);
     free(vpn->pid_file);
-    free(vpn);
+    //free(vpn);
 }
 
 static void