Close fd on error in readfile()

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

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
@@ -361,57 +361,62 @@ int cgit_parse_snapshots_mask(const char *str)
 }
 
 int cgit_open_filter(struct cgit_filter *filter)
 {
 
         filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                 "Unable to duplicate STDOUT");
         chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
         filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
         if (filter->pid == 0) {
                 close(filter->pipe_fh[1]);
                 chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
                         "Unable to use pipe as STDIN");
                 execvp(filter->cmd, filter->argv);
                 die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
                         strerror(errno), errno);
         }
         close(filter->pipe_fh[0]);
         chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
                 "Unable to use pipe as STDOUT");
         close(filter->pipe_fh[1]);
         return 0;
 }
 
 int cgit_close_filter(struct cgit_filter *filter)
 {
         chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                 "Unable to restore STDOUT");
         close(filter->old_stdout);
         if (filter->pid < 0)
                 return 0;
         waitpid(filter->pid, &filter->exitstatus, 0);
         if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
                 return 0;
         die("Subprocess %s exited abnormally", filter->cmd);
 }
 
 /* Read the content of the specified file into a newly allocated buffer,
  * zeroterminate the buffer and return 0 on success, errno otherwise.
  */
 int readfile(const char *path, char **buf, size_t *size)
 {
         int fd;
         struct stat st;
 
         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);
 }