ui-repolist: initialize char *buf to NULL

[ps-cgit] / cache.c

diff --git a/cache.c b/cache.c
index cd998127cc23e361cd9f53d9d988754fa5faa93d..b169d20f779aaa21ed5c3bd8e4e21c62500a0c90 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -13,12 +13,12 @@
  *
  */
 
-#ifdef HAVE_LINUX_SENDFILE
-#include <sys/sendfile.h>
-#endif
 #include "cgit.h"
 #include "cache.h"
 #include "html.h"
+#ifdef HAVE_LINUX_SENDFILE
+#include <sys/sendfile.h>
+#endif
 
 #define CACHE_BUFSIZE (1024 * 4)
 
@@ -215,19 +215,25 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Redirect stdout to lockfile */
-       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1)
+       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1) {
+               close(tmp);
                return errno;
+       }
 
        /* Generate cache content */
        slot->fn();
 
        /* update stat info */
-       if (fstat(slot->lock_fd, &slot->cache_st))
+       if (fstat(slot->lock_fd, &slot->cache_st)) {
+               close(tmp);
                return errno;
+       }
 
        /* Restore stdout */
-       if (dup2(tmp, STDOUT_FILENO) == -1)
+       if (dup2(tmp, STDOUT_FILENO) == -1) {
+               close(tmp);
                return errno;
+       }
 
        /* Close the temporary filedescriptor */
        if (close(tmp))