cache: fix resource leak: close file handle before return

Coverity-id: 13910
Signed-off-by: Christian Hesse <mail@eworm.de>

diff --git a/cache.c b/cache.c
index 57c891864ffb8b70447c6db5fd8366f662aadd39..b169d20f779aaa21ed5c3bd8e4e21c62500a0c90 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -215,19 +215,25 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Redirect stdout to lockfile */
                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;
                return errno;

+       }

 
        /* Generate cache content */
        slot->fn();
 
        /* update stat info */
 
        /* 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;
                return errno;

+       }

 
        /* Restore stdout */
 
        /* Restore stdout */

-       if (dup2(tmp, STDOUT_FILENO) == -1)
+       if (dup2(tmp, STDOUT_FILENO) == -1) {
+               close(tmp);

                return errno;
                return errno;

+       }

 
        /* Close the temporary filedescriptor */
        if (close(tmp))
 
        /* Close the temporary filedescriptor */
        if (close(tmp))