summaryrefslogtreecommitdiffabout
authorRys Sommefeldt <rys@pixeltards.com>2009-11-07 14:24:45 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-11-07 14:34:18 (UTC)
commit8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (patch) (side-by-side diff)
tree2b66d688de6ce2b7598cc78ea6ed812f2d5f882a
parente34a3b5adc00255f8acb7d674e5fdadef2ac80f7 (diff)
downloadcgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.zip
cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.tar.gz
cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.tar.bz2
Close fd on error in readfile()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index d7b2d5a..a27ab30 100644
--- a/shared.c
+++ b/shared.c
@@ -408,6 +408,10 @@ int readfile(const char *path, char **buf, size_t *size)
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);
@@ -415,2 +419,3 @@ int readfile(const char *path, char **buf, size_t *size)
(*buf)[*size] = '\0';
+ close(fd);
return (*size == st.st_size ? 0 : errno);