mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/fix-config-fd-leak'

Browse Source 
* ss/fix-config-fd-leak:
  config: close config file handle in case of error
This commit is contained in:
Junio C Hamano
2015-08-26 15:45:30 -07:00
parent 33f2c4ff7b 54d160ec0d
commit 51e83a4898
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config.c
View File

@ -1935,7 +1935,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
const char *key, const char *value, const char *key, const char *value,
const char *value_regex, int multi_replace) const char *value_regex, int multi_replace)
{ {
int fd = -1, in_fd; int fd = -1, in_fd = -1;
int ret; int ret;
struct lock_file *lock = NULL; struct lock_file *lock = NULL;
char *filename_buf = NULL; char *filename_buf = NULL;
@ -2065,6 +2065,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
goto out_free; goto out_free;
} }
close(in_fd); close(in_fd);
in_fd = -1;
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
error("chmod on %s failed: %s", error("chmod on %s failed: %s",
@ -2148,6 +2149,8 @@ out_free:
free(filename_buf); free(filename_buf);
if (contents) if (contents)
munmap(contents, contents_sz); munmap(contents, contents_sz);
if (in_fd >= 0)
close(in_fd);
return ret; return ret;
write_err_out: write_err_out: