From: Nguyễn Thái Ngọc Duy Date: Tue, 20 Dec 2016 09:48:36 +0000 (+0700) Subject: config.c: handle lock file in error case in git_config_rename_... X-Git-Tag: v2.11.1~15^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c06fa62dfc9c882f60250e60ad91fbb6a7e6f8e7;p=git config.c: handle lock file in error case in git_config_rename_... We could rely on atexit() to clean up everything, but let's be explicit when we can. And it's good anyway because the function is called the second time in the same process, we're in trouble. This function should not affect the successful case because after commit_lock_file() is called, rollback_lock_file() becomes no-op, as long as it is initialized. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/config.c b/config.c index 8065296a11..398ffec29d 100644 --- a/config.c +++ b/config.c @@ -2314,7 +2314,7 @@ int git_config_rename_section_in_file(const char *config_filename, if (new_name && !section_name_is_ok(new_name)) { ret = error("invalid section name: %s", new_name); - goto out; + goto out_no_rollback; } if (!config_filename) @@ -2396,6 +2396,8 @@ commit_and_out: ret = error_errno("could not write config file %s", config_filename); out: + rollback_lock_file(lock); +out_no_rollback: free(filename_buf); return ret; }