From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v2 1/5] diff: --dirstat leakfix
Date: Thu, 17 Aug 2023 15:29:45 -0700 [thread overview]
Message-ID: <20230817222949.3835424-2-gitster@pobox.com> (raw)
In-Reply-To: <20230817222949.3835424-1-gitster@pobox.com>
The dirstat_dir structure holds a list of files that had "damages"
and is used to summarize the change by directory. It was allocated,
used, and then left behind, leaking.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 14 ++++++++++++--
t/t4047-diff-dirstat.sh | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 648f6717a5..03d0cfc700 100644
--- a/diff.c
+++ b/diff.c
@@ -2977,6 +2977,7 @@ static void show_dirstat(struct diff_options *options)
unsigned long changed;
struct dirstat_dir dir;
struct diff_queue_struct *q = &diff_queued_diff;
+ struct dirstat_file *to_free;
dir.files = NULL;
dir.alloc = 0;
@@ -3060,13 +3061,17 @@ static void show_dirstat(struct diff_options *options)
dir.nr++;
}
+ to_free = dir.files;
+
/* This can happen even with many files, if everything was renames */
if (!changed)
- return;
+ goto free_return;
/* Show all directories with more than x% of the changes */
QSORT(dir.files, dir.nr, dirstat_compare);
gather_dirstat(options, &dir, changed, "", 0);
+free_return:
+ free(to_free);
}
static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
@@ -3074,6 +3079,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
int i;
unsigned long changed;
struct dirstat_dir dir;
+ struct dirstat_file *to_free;
if (data->nr == 0)
return;
@@ -3104,13 +3110,17 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
dir.nr++;
}
+ to_free = dir.files;
+
/* This can happen even with many files, if everything was renames */
if (!changed)
- return;
+ goto free_return;
/* Show all directories with more than x% of the changes */
QSORT(dir.files, dir.nr, dirstat_compare);
gather_dirstat(options, &dir, changed, "", 0);
+free_return:
+ free(to_free);
}
static void free_diffstat_file(struct diffstat_file *f)
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 7fec2cb9cd..70224c3da1 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='diff --dirstat tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# set up two commits where the second commit has these files
--
2.42.0-rc2
next prev parent reply other threads:[~2023-08-17 22:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 16:46 git bug report Paul Watson
2023-08-04 17:28 ` rsbecker
2023-08-04 17:48 ` [EXTERNAL] " Paul Watson
2023-08-04 18:12 ` rsbecker
2023-08-07 15:46 ` Paul Watson
2023-08-08 13:07 ` Paul Watson
2023-08-08 13:28 ` rsbecker
2023-08-08 17:07 ` Junio C Hamano
2023-08-16 23:45 ` [PATCH] diff: tighten interaction between -w and --exit-code Junio C Hamano
2023-08-17 5:10 ` Jeff King
2023-08-17 16:12 ` Junio C Hamano
2023-08-17 19:49 ` Jeff King
2023-08-17 19:56 ` Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 0/5] fix interactions with "-w" and "--exit-code" Junio C Hamano
2023-08-17 22:29 ` Junio C Hamano [this message]
2023-08-17 22:29 ` [PATCH v2 2/5] diff: move the fallback "--exit-code" code down Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 3/5] diff: mode-only change should be noticed by "--patch -w --exit-code" Junio C Hamano
2023-08-18 21:15 ` Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 4/5] diff: teach "--stat -w --exit-code" to notice differences Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 5/5] diff: teach "--name-status" and friends to honor "--exit-code -w" Junio C Hamano
2023-08-17 22:37 ` [PATCH v2 0/5] fix interactions with "-w" and "--exit-code" Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 " Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 1/5] diff: move the fallback "--exit-code" code down Junio C Hamano
2023-08-21 20:41 ` Jeff King
2023-08-18 23:59 ` [PATCH v3 2/5] diff: mode-only change should be noticed by "--patch -w --exit-code" Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 3/5] diff: teach "--stat -w --exit-code" to notice differences Junio C Hamano
2023-08-21 20:45 ` Jeff King
2023-08-18 23:59 ` [PATCH v3 4/5] t4040: remove test that succeeded for a wrong reason Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 5/5] diff: the -w option breaks --exit-code for --raw and other output modes Junio C Hamano
2023-08-21 21:00 ` Jeff King
2023-08-21 21:08 ` Jeff King
2023-08-21 22:23 ` Jeff King
2023-08-21 22:16 ` Junio C Hamano
2023-08-21 22:26 ` Junio C Hamano
2023-08-22 1:30 ` Jeff King
2023-08-21 21:02 ` [PATCH v3 0/5] fix interactions with "-w" and "--exit-code" Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230817222949.3835424-2-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).