From 69ea6b9373c0cc992932499b89330c26e27d6510 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 24 Sep 2015 12:03:58 +0000
Subject: [PATCH 1/2] Do not leak log file descriptor.

---
 log.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/log.c b/log.c
index 8c2fdb07a..711b9b8a1 100644
--- a/log.c
+++ b/log.c
@@ -42,6 +42,9 @@ log_event_cb(unused int severity, const char *msg)
 void
 log_open(const char *path)
 {
+	if (log_file != NULL)
+		fclose(log_file);
+
 	log_file = fopen(path, "w");
 	if (log_file == NULL)
 		return;

From 2a62917444783e62ea5b8c13069aecb77b47ff07 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 24 Sep 2015 12:06:20 +0000
Subject: [PATCH 2/2] Don't leak fd and path on failure.

---
 client.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client.c b/client.c
index d36be86bb..da7bb3144 100644
--- a/client.c
+++ b/client.c
@@ -153,15 +153,19 @@ client_connect(struct event_base *base, char *path, int start_server)
 		}
 		fd = server_start(base, lockfd, lockfile);
 	}
+
 	if (locked) {
 		free(lockfile);
 		close(lockfd);
 	}
-
 	setblocking(fd, 0);
 	return (fd);
 
 failed:
+	if (locked) {
+		free(lockfile);
+		close(lockfd);
+	}
 	close(fd);
 	return (-1);
 }