Avoid Coverity warning about unfree()d git_exec_path()

dscho · dscho · commit c897c69f990b · 2016-12-12T22:31:35.000+01:00
Technically, it is correct that git_exec_path() returns a possibly
malloc()ed string. Practically, it is *sometimes* not malloc()ed. So
let's just use a static variable to make it a singleton. That'll shut
Coverity up, hopefully.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/exec_cmd.c b/exec_cmd.c
@@ -65,6 +65,7 @@ void git_set_argv_exec_path(const char *exec_path)
 const char *git_exec_path(void)
 {
 	const char *env;
+	static char *system_exec_path;
 
 	if (argv_exec_path)
 		return argv_exec_path;
@@ -74,7 +75,9 @@ const char *git_exec_path(void)
 		return env;
 	}
 
-	return system_path(GIT_EXEC_PATH);
+	if (!system_exec_path)
+		system_exec_path = system_path(GIT_EXEC_PATH);
+	return system_exec_path;
 }
 
 static void add_path(struct strbuf *out, const char *path)

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ void git_set_argv_exec_path(const char *exec_path)`
`65`	`65`	`const char *git_exec_path(void)`
`66`	`66`	`{`
`67`	`67`	`const char *env;`
	`68`	`+ static char *system_exec_path;`
`68`	`69`
`69`	`70`	`if (argv_exec_path)`
`70`	`71`	`return argv_exec_path;`
`@@ -74,7 +75,9 @@ const char *git_exec_path(void)`
`74`	`75`	`return env;`
`75`	`76`	`}`
`76`	`77`
`77`		`- return system_path(GIT_EXEC_PATH);`
	`78`	`+ if (!system_exec_path)`
	`79`	`+ system_exec_path = system_path(GIT_EXEC_PATH);`
	`80`	`+ return system_exec_path;`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`static void add_path(struct strbuf out, const char path)`