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

From: Junio C Hamano <[email-masked]>
Date: Fri, 14 Aug 2015 14:00:54 -0700

Sven Strickroth <[email-masked]> writes:

> Without this patch there might be open file handle leaks.
>
> Signed-off-by: Sven Strickroth <[email-masked]>
> Signed-off-by: Sup Yut Sum <[email-masked]>

Who are these two people and how are they related to this change?
I am wondering if "Sup" is the author of this change and "Sven" is
only relaying his change, or the other way around or what.

In any case, your log message left a lot of room for improvement;
here is my attempt.

-- >8 --
From: Sven Strickroth <[email-masked]>
Date: Fri, 14 Aug 2015 22:21:17 +0200
Subject: [PATCH] config: close config file handle in case of error

When updating an existing configuration file, we did not always
close the filehandle that is reading from the current configuration
file when we encountered an error (e.g. when unsetting a variable
that does not exist).

Signed-off-by: Sven Strickroth <[email-masked]>
Signed-off-by: Sup Yut Sum <[email-masked]>
Reviewed-by: Eric Sunshine <[email-masked]>
Signed-off-by: Junio C Hamano <[email-masked]>
---
 config.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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:
-- 
2.5.0-487-g2edca40