Re: [PATCH] Correctly close config file handle in case of error

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Aug 14, 2015, 20:32 UTC
Message-ID: <CAPig+cSSdGeMuV1XLqROXvSeYfmkNc_N7E_pzfJWdDR6wfD80A@mail.gmail.com>
In-Reply-To: <55CE4DBD.2070308@cs-ware.de>

On Fri, Aug 14, 2015 at 4:21 PM, Sven Strickroth <sven@cs-ware.de> wrote:

> Without this patch there might be open file handle leaks.
>
> Signed-off-by: Sven Strickroth <email@cs-ware.de>
> Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>

Better. Thanks.

Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>

Show 35 quoted lines

> ---
> diff --git a/config.c b/config.c
> index 9fd275f..83caa25 100644
> --- a/config.c
> +++ b/config.c
> @@ -1935,7 +1935,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
>                                 const char *key, const char *value,
>                                 const char *value_regex, int multi_replace)
>  {
> -       int fd = -1, in_fd;
> +       int fd = -1, in_fd = -1;
>         int ret;
>         struct lock_file *lock = NULL;
>         char *filename_buf = NULL;
> @@ -2065,6 +2065,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
>                         goto out_free;
>                 }
>                 close(in_fd);
> +               in_fd = -1;
>
>                 if (chmod(lock->filename.buf, st.st_mode & 07777) < 0) {
>                         error("chmod on %s failed: %s",
> @@ -2148,6 +2149,8 @@ out_free:
>         free(filename_buf);
>         if (contents)
>                 munmap(contents, contents_sz);
> +       if (in_fd >= 0)
> +               close(in_fd);
>         return ret;
>
>  write_err_out:
> --
> Best regards,
>  Sven Strickroth
>  PGP key id F5A9D4C4 @ any key-server