Merge branch 'cc/split-index-config'

gitster · gitster · commit 3961c516990e · 2017-04-26T15:39:09.000+09:00
The split-index code configuration code used an unsafe git_path()
function without copying its result out.

* cc/split-index-config:
  read-cache: avoid using git_path() in freshen_shared_index()
diff --git a/read-cache.c b/read-cache.c
@@ -1824,9 +1824,10 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
  */
 static void freshen_shared_index(char *base_sha1_hex, int warn)
 {
-	const char *shared_index = git_path("sharedindex.%s", base_sha1_hex);
+	char *shared_index = git_pathdup("sharedindex.%s", base_sha1_hex);
 	if (!check_and_freshen_file(shared_index, 1) && warn)
 		warning("could not freshen shared index '%s'", shared_index);
+	free(shared_index);
 }
 
 int read_index_from(struct index_state *istate, const char *path)

Original file line number	Diff line number	Diff line change
`@@ -1824,9 +1824,10 @@ int do_read_index(struct index_state istate, const char path, int must_exist)`
`1824`	`1824`	`*/`
`1825`	`1825`	`static void freshen_shared_index(char *base_sha1_hex, int warn)`
`1826`	`1826`	`{`
`1827`		`- const char *shared_index = git_path("sharedindex.%s", base_sha1_hex);`
	`1827`	`+ char *shared_index = git_pathdup("sharedindex.%s", base_sha1_hex);`
`1828`	`1828`	`if (!check_and_freshen_file(shared_index, 1) && warn)`
`1829`	`1829`	`warning("could not freshen shared index '%s'", shared_index);`
	`1830`	`+ free(shared_index);`
`1830`	`1831`	`}`
`1831`	`1832`
`1832`	`1833`	`int read_index_from(struct index_state istate, const char path)`