From: Jens Axboe <axboe@kernel.dk>
Date: Sat, 1 Oct 2011 20:26:42 +0000 (-0400)
Subject: server: malloc/free fix
X-Git-Tag: fio-1.99~66
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=c77a99e74e88a8ea1a8c0904aef3f7c81e07273f

server: malloc/free fix

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/client.c b/client.c
index 63ecee6d..05bba38d 100644
--- a/client.c
+++ b/client.c
@@ -106,13 +106,11 @@ static int fio_client_connect(struct fio_client *client)
 	fd = socket(AF_INET, SOCK_STREAM, 0);
 	if (fd < 0) {
 		log_err("fio: socket: %s\n", strerror(errno));
-		free(client);
 		return 1;
 	}
 
 	if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
 		log_err("fio: connect: %s\n", strerror(errno));
-		free(client);
 		return 1;
 	}
 
@@ -278,6 +276,5 @@ int fio_handle_clients(void)
 	}
 
 	free(pfds);
-
 	return 0;
 }
diff --git a/server.c b/server.c
index 8f93d2f8..648758e2 100644
--- a/server.c
+++ b/server.c
@@ -302,6 +302,7 @@ static int handle_connection(int sk)
 			break;
 
 		free(cmd);
+		cmd = NULL;
 	}
 
 	if (cmd)