Re: [PATCH v5 24/27] revisions API: call diff_free(&revs->pruning) in revisions_release()

Phillip Wood <phillip.wood123@xxxxxxxxx> · Sun, 3 Apr 2022 14:00:16 +0100

Hi Ævar

On 02/04/2022 11:49, Ævar Arnfjörð Bjarmason wrote:
Call diff_free() on the "pruning" member of "struct rev_info".  Doing
so makes several tests pass under SANITIZE=leak.

This was also the last missing piece that allows us to remove the
UNLEAK() in "cmd_diff" and "cmd_diff_index", which allows us to use
those commands as a canary for general leaks in the revisions API. See
[1] for further rationale, and 886e1084d78 (builtin/: add UNLEAKs,
2017-10-01) for the commit that added the UNLEAK() there.

Oh is the the answer to my confusion about patch 14? I wonder if the 
change could come earlier so we can remove the UNLEAK()s all at once?

Best Wishes

Phillip

1. https://lore.kernel.org/git/220218.861r00ib86.gmgdl@xxxxxxxxxxxxxxxxxxx/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
  builtin/diff-index.c                | 1 -
  builtin/diff.c                      | 1 -
  revision.c                          | 1 +
  t/t1001-read-tree-m-2way.sh         | 1 +
  t/t1002-read-tree-m-u-2way.sh       | 1 +
  t/t2200-add-update.sh               | 1 +
  t/t4039-diff-assume-unchanged.sh    | 1 +
  t/t4206-log-follow-harder-copies.sh | 2 ++
  t/t6131-pathspec-icase.sh           | 2 ++
  9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 3a83183c312..7d158af6b6d 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -70,7 +70,6 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
  		return -1;
  	}
  	result = run_diff_index(&rev, option);
-	UNLEAK(rev);
  	result = diff_result_code(&rev.diffopt, result);
  	release_revisions(&rev);
  	return result;
diff --git a/builtin/diff.c b/builtin/diff.c
index dd48336da56..f539132ac68 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -594,7 +594,6 @@ 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);
  	release_revisions(&rev);
  	UNLEAK(ent);
  	UNLEAK(blob);
diff --git a/revision.c b/revision.c
index e972addd8fc..8bc777da828 100644
--- a/revision.c
+++ b/revision.c
@@ -2955,6 +2955,7 @@ void release_revisions(struct rev_info *revs)
  	clear_pathspec(&revs->prune_data);
  	release_revisions_mailmap(revs->mailmap);
  	free_grep_patterns(&revs->grep_filter);
+	diff_free(&revs->pruning);
  	reflog_walk_info_release(revs->reflog_info);
  }
  
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 0710b1fb1e9..516a6112fdc 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -21,6 +21,7 @@ In the test, these paths are used:
  	yomin   - not in H or M
  '
  
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  . "$TEST_DIRECTORY"/lib-read-tree.sh
  
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 46cbd5514a6..bd5313caec9 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -9,6 +9,7 @@ This is identical to t1001, but uses -u to update the work tree as well.
  
  '
  
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  . "$TEST_DIRECTORY"/lib-read-tree.sh
  
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 0c38f8e3569..be394f1131a 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -14,6 +14,7 @@ only the updates to dir/sub.
  Also tested are "git add -u" without limiting, and "git add -u"
  without contents changes, and other conditions'
  
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  
  test_expect_success setup '
diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 0eb0314a8b3..78090e6852d 100755
--- a/t/t4039-diff-assume-unchanged.sh
+++ b/t/t4039-diff-assume-unchanged.sh
@@ -2,6 +2,7 @@
  
  test_description='diff with assume-unchanged entries'
  
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  
  # external diff has been tested in t4020-diff-external.sh
diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh
index 4871a5dc92f..33ecf82c7f9 100755
--- a/t/t4206-log-follow-harder-copies.sh
+++ b/t/t4206-log-follow-harder-copies.sh
@@ -6,6 +6,8 @@
  test_description='Test --follow should always find copies hard in git log.
  
  '
+
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  . "$TEST_DIRECTORY"/lib-diff.sh
  
diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh
index 39fc3f6769b..770cce026cb 100755
--- a/t/t6131-pathspec-icase.sh
+++ b/t/t6131-pathspec-icase.sh
@@ -1,6 +1,8 @@
  #!/bin/sh
  
  test_description='test case insensitive pathspec limiting'
+
+TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
  
  if test_have_prereq CASE_INSENSITIVE_FS






