From: Jens Axboe <axboe@fb.com>
Date: Fri, 11 Apr 2014 17:37:34 +0000 (-0600)
Subject: server: ensure that server pid file mem is always freed
X-Git-Tag: fio-2.1.9~69
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=b8ba87ac231c3facccb1e5b0e8b1b88dd162f8f3

server: ensure that server pid file mem is always freed

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/init.c b/init.c
index e9e49ebb..1c37ab92 100644
--- a/init.c
+++ b/init.c
@@ -1985,6 +1985,8 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
 
 	if (is_backend && backend)
 		return fio_start_server(pid_file);
+	else if (pid_file)
+		free(pid_file);
 
 	if (td) {
 		if (!ret)
diff --git a/server.c b/server.c
index beee2db1..73866d77 100644
--- a/server.c
+++ b/server.c
@@ -1683,6 +1683,7 @@ int fio_start_server(char *pidfile)
 	if (check_existing_pidfile(pidfile)) {
 		log_err("fio: pidfile %s exists and server appears alive\n",
 								pidfile);
+		free(pidfile);
 		return -1;
 	}
 
@@ -1694,6 +1695,7 @@ int fio_start_server(char *pidfile)
 	} else if (pid) {
 		int ret = write_pid(pid, pidfile);
 
+		free(pidfile);
 		exit(ret);
 	}