commit.c: fix a memory leak

stefanbeller · gitster · commit 5d0b9bf86d98 · 2015-03-23T11:12:58.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -229,7 +229,7 @@ static int commit_index_files(void)
 static int list_paths(struct string_list *list, const char *with_tree,
 		      const char *prefix, const struct pathspec *pattern)
 {
-	int i;
+	int i, ret;
 	char *m;
 
 	if (!pattern->nr)
@@ -256,7 +256,9 @@ static int list_paths(struct string_list *list, const char *with_tree,
 			item->util = item; /* better a valid pointer than a fake one */
 	}
 
-	return report_path_error(m, pattern, prefix);
+	ret = report_path_error(m, pattern, prefix);
+	free(m);
+	return ret;
 }
 
 static void add_remove_files(struct string_list *list)

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ static int commit_index_files(void)`
`229`	`229`	`static int list_paths(struct string_list list, const char with_tree,`
`230`	`230`	`const char prefix, const struct pathspec pattern)`
`231`	`231`	`{`
`232`		`- int i;`
	`232`	`+ int i, ret;`
`233`	`233`	`char *m;`
`234`	`234`
`235`	`235`	`if (!pattern->nr)`
`@@ -256,7 +256,9 @@ static int list_paths(struct string_list list, const char with_tree,`
`256`	`256`	`item->util = item; /* better a valid pointer than a fake one */`
`257`	`257`	`}`
`258`	`258`
`259`		`- return report_path_error(m, pattern, prefix);`
	`259`	`+ ret = report_path_error(m, pattern, prefix);`
	`260`	`+ free(m);`
	`261`	`+ return ret;`
`260`	`262`	`}`
`261`	`263`
`262`	`264`	`static void add_remove_files(struct string_list *list)`