diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-03 19:17:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-03 19:17:59 -0700 |
| commit | 8136099a318a3c2c8883fba8dd3f570fc332ead6 (patch) | |
| tree | b9c5fa44a3d33f50c0c98ef1020938082efe077d | |
| parent | Merge branch 'sg/wt-status-header-inclusion' into maint (diff) | |
| parent | config: close config file handle in case of error (diff) | |
| download | tgif-8136099a318a3c2c8883fba8dd3f570fc332ead6.tar.xz | |
Merge branch 'ss/fix-config-fd-leak' into maint
* ss/fix-config-fd-leak:
config: close config file handle in case of error
| -rw-r--r-- | config.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1954,7 +1954,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; @@ -2084,6 +2084,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", @@ -2167,6 +2168,8 @@ out_free: free(filename_buf); if (contents) munmap(contents, contents_sz); + if (in_fd >= 0) + close(in_fd); return ret; write_err_out: |