[PATCH 2/4] config.c: fix mmap leak when writing config
- From
Jeff King <peff@peff.net>
- Date
- May 28, 2015, 07:54 UTC
- Message-ID
- <20150528075443.GB23395@peff.net>
- In-Reply-To
- <20150528075142.GB3688@peff.net>
We mmap the existing config file, but fail to unmap it if we hit an error. The function already has a shared exit path, so we can fix this by moving the mmap pointer to the function scope and clearing it in the shared exit.
Signed-off-by: Jeff King <peff@peff.net> --- config.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/config.c b/config.c index ab46462..6917100 100644 --- a/config.c +++ b/config.c @@ -1939,6 +1939,8 @@ int git_config_set_multivar_in_file(const char *config_filename, int ret; struct lock_file *lock = NULL; char *filename_buf = NULL; + char *contents = NULL; + size_t contents_sz; /* parse-key returns negative; flip the sign to feed exit(3) */ ret = 0 - git_config_parse_key(key, &store.key, &store.baselen); @@ -1988,8 +1990,7 @@ int git_config_set_multivar_in_file(const char *config_filename, goto write_err_out; } else { struct stat st; - char *contents; - size_t contents_sz, copy_begin, copy_end; + size_t copy_begin, copy_end; int i, new_line = 0; if (value_regex == NULL) @@ -2108,8 +2109,6 @@ int git_config_set_multivar_in_file(const char *config_filename, contents_sz - copy_begin) < contents_sz - copy_begin) goto write_err_out; - - munmap(contents, contents_sz); } if (commit_lock_file(lock) < 0) { @@ -2135,6 +2134,8 @@ out_free: if (lock) rollback_lock_file(lock); free(filename_buf); + if (contents) + munmap(contents, contents_sz); return ret; write_err_out:
-- 2.4.2.668.gc3b1ade.dirty