diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 15:35:36 +0100 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 15:35:36 +0100 |
commit | 4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) | |
tree | 593616b5bd2e8c662d00478f50ecee86a0002224 /shared.c | |
parent | ui-shared.c: prettify download links when generated from tag page (diff) | |
parent | Close fd on error in readfile() (diff) | |
download | cgit-pink-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz cgit-pink-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip |
Merge branch 'stable'
Diffstat (limited to '')
-rw-r--r-- | shared.c | 9 |
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 @@ -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); } |