Merge pull request #236 from laijs/fix-memory-leak

fix memory leak in hyper_free_exec()

Author: laijs

src/exec.c

@@ -580,16 +580,7 @@ static void hyper_exec_process(struct hyper_exec *exec, struct stdio_config *io)
 
 static void hyper_free_exec(struct hyper_exec *exec)
 {
-	int i;
-
-	free(exec->container_id);
-
-	for (i = 0; i < exec->argc; i++) {
-		//fprintf(stdout, "argv %d %s\n", i, exec->argv[i]);
-		free(exec->argv[i]);
-	}
-
-	free(exec->argv);
+	hyper_cleanup_exec(exec);
 	free(exec);
 }
 

src/parse.c

@@ -181,7 +181,7 @@ static int container_parse_argv(struct hyper_exec *exec, char *json, jsmntok_t *
 	return i;
 }
 
-static void container_cleanup_exec(struct hyper_exec *exec)
+void hyper_cleanup_exec(struct hyper_exec *exec)
 {
 	int i;
 
@@ -610,7 +610,7 @@ void hyper_free_container(struct hyper_container *c)
 	container_free_ports(c);
 	container_free_sysctl(c);
 	container_free_fsmap(c);
-	container_cleanup_exec(&c->exec);
+	hyper_cleanup_exec(&c->exec);
 
 	list_del_init(&c->list);
 	free(c);
@@ -1386,7 +1386,7 @@ struct hyper_exec *hyper_parse_execcmd(char *json, int length)
 	free(toks);
 	return exec;
 fail:
-	container_cleanup_exec(exec);
+	hyper_cleanup_exec(exec);
 	free(exec);
 	exec = NULL;
 	goto out;

src/parse.h

@@ -17,5 +17,5 @@ struct hyper_interface *hyper_parse_setup_interface(char *json, int length);
 void hyper_free_interface(struct hyper_interface *iface);
 int hyper_parse_setup_routes(struct hyper_route **routes, uint32_t *r_num, char *json, int length);
 JSON_Value *hyper_json_parse(char *json, int length);
-
+void hyper_cleanup_exec(struct hyper_exec *exec);
 #endif