Merge branch 'ma/builtin-unleak'

gitster · gitster · commit 5261fefa4aa7 · 2017-10-07T16:27:55.000+09:00
Many variables that points at a region of memory that will live
throughout the life of the program have been marked with UNLEAK
marker to help the leak checkers concentrate on real leaks..

* ma/builtin-unleak:
  builtin/: add UNLEAKs
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -1297,6 +1297,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		strbuf_release(&buf);
 	}
 
+	UNLEAK(opts);
 	if (opts.patch_mode || opts.pathspec.nr)
 		return checkout_paths(&opts, new.name);
 	else
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
@@ -56,5 +56,6 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 		return -1;
 	}
 	result = run_diff_index(&rev, cached);
+	UNLEAK(rev);
 	return diff_result_code(&rev.diffopt, result);
 }
diff --git a/builtin/diff.c b/builtin/diff.c
@@ -464,5 +464,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	result = diff_result_code(&rev.diffopt, result);
 	if (1 < rev.diffopt.skip_stat_unmatch)
 		refresh_index_quietly();
+	UNLEAK(rev);
+	UNLEAK(ent);
+	UNLEAK(blob);
 	return result;
 }
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
@@ -494,5 +494,6 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 				  always, allow_undefined, data.name_only);
 	}
 
+	UNLEAK(revs);
 	return 0;
 }
diff --git a/builtin/tag.c b/builtin/tag.c
@@ -552,9 +552,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))
 		printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev.hash, DEFAULT_ABBREV));
 
-	strbuf_release(&err);
-	strbuf_release(&buf);
-	strbuf_release(&ref);
-	strbuf_release(&reflog_msg);
+	UNLEAK(buf);
+	UNLEAK(ref);
+	UNLEAK(reflog_msg);
+	UNLEAK(msg);
+	UNLEAK(err);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1297,6 +1297,7 @@ int cmd_checkout(int argc, const char *argv, const char prefix)`
`1297`	`1297`	`strbuf_release(&buf);`
`1298`	`1298`	`}`
`1299`	`1299`
	`1300`	`+ UNLEAK(opts);`
`1300`	`1301`	`if (opts.patch_mode \|\| opts.pathspec.nr)`
`1301`	`1302`	`return checkout_paths(&opts, new.name);`
`1302`	`1303`	`else`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,6 @@ int cmd_diff_index(int argc, const char *argv, const char prefix)`
`56`	`56`	`return -1;`
`57`	`57`	`}`
`58`	`58`	`result = run_diff_index(&rev, cached);`
	`59`	`+ UNLEAK(rev);`
`59`	`60`	`return diff_result_code(&rev.diffopt, result);`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -464,5 +464,8 @@ int cmd_diff(int argc, const char *argv, const char prefix)`
`464`	`464`	`result = diff_result_code(&rev.diffopt, result);`
`465`	`465`	`if (1 < rev.diffopt.skip_stat_unmatch)`
`466`	`466`	`refresh_index_quietly();`
	`467`	`+ UNLEAK(rev);`
	`468`	`+ UNLEAK(ent);`
	`469`	`+ UNLEAK(blob);`
`467`	`470`	`return result;`
`468`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -494,5 +494,6 @@ int cmd_name_rev(int argc, const char *argv, const char prefix)`
`494`	`494`	`always, allow_undefined, data.name_only);`
`495`	`495`	`}`
`496`	`496`
	`497`	`+ UNLEAK(revs);`
`497`	`498`	`return 0;`
`498`	`499`	`}`