config.c: fix writing config files on Windows network shares

kblees · dscho · commit 36d5d2e8897b · 2015-06-30T16:54:22.000+02:00
Renaming to an existing file doesn't work on Windows network shares if the target file is open. munmap() the old config file before commit_lock_file. This fixes #226. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/config.c b/config.c
@@ -2153,6 +2153,9 @@ 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);
+		contents = NULL;
 	}
 
 	if (commit_lock_file(lock) < 0) {

Original file line number	Diff line number	Diff line change
`@@ -2153,6 +2153,9 @@ int git_config_set_multivar_in_file(const char *config_filename,`
`2153`	`2153`	`contents_sz - copy_begin) <`
`2154`	`2154`	`contents_sz - copy_begin)`
`2155`	`2155`	`goto write_err_out;`
	`2156`	`+`
	`2157`	`+ munmap(contents, contents_sz);`
	`2158`	`+ contents = NULL;`
`2156`	`2159`	`}`
`2157`	`2160`
`2158`	`2161`	`if (commit_lock_file(lock) < 0) {`