From 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 Mon Sep 17 00:00:00 2001
From: Rys Sommefeldt
Date: Sat, 7 Nov 2009 15:24:45 +0100
Subject: Close fd on error in readfile()

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 shared.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared.c b/shared.c
index d7b2d5a..a27ab30 100644
--- a/shared.c
+++ b/shared.c
@@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size)
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
 		return errno;
-	if (fstat(fd, &st))
+	if (fstat(fd, &st)) {
+		close(fd);
 		return errno;
-	if (!S_ISREG(st.st_mode))
+	}
+	if (!S_ISREG(st.st_mode)) {
+		close(fd);
 		return EISDIR;
+	}
 	*buf = xmalloc(st.st_size + 1);
 	*size = read_in_full(fd, *buf, st.st_size);
 	(*buf)[*size] = '\0';
+	close(fd);
 	return (*size == st.st_size ? 0 : errno);
 }
-- 
cgit v1.2.3-70-g09d2