[PATCH] Correctly close config file handle in case of error
From: Sven Strickroth <hidden>
Date: 2016-06-15 23:06:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth <redacted> Signed-off-by: Sup Yut Sum <redacted> --- 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:
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server