From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: [PATCH 3/3] diff: remove parseopts member of struct diff_options
Date: Wed, 30 Nov 2022 19:04:53 +0100 [thread overview]
Message-ID: <d226d3bc-fb15-58a4-f516-bda51a912228@web.de> (raw)
In-Reply-To: <0620b4a6-b80a-d8a0-5a35-857b9fe0c986@web.de>
repo_diff_setup() builds the struct option array with git diff's command
line options and stores a pointer to it in the parseopts member of
struct diff_options. The array is freed by diff_setup_done(), but not
by release_revisions(). repo_init_revisions() calls repo_diff_setup(),
thus calling repo_init_revisions() then release_revisions() leaks it.
We could free the array in release_revisions() as well to plug that
leak, but there is a better way: Only build it when needed. Move the
get_diff_parseopts() calls to the two places that use the array, free it
after use and get rid of the parseopts member.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
diff.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index e469d5d2a0..6415c4dc2d 100644
--- a/diff.c
+++ b/diff.c
@@ -4615,8 +4615,6 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
}
-static struct option *get_diff_parseopts(struct diff_options *options);
-
void repo_diff_setup(struct repository *r, struct diff_options *options)
{
memcpy(options, &default_diff_options, sizeof(*options));
@@ -4662,8 +4660,6 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->color_moved = diff_color_moved_default;
options->color_moved_ws_handling = diff_color_moved_ws_default;
-
- options->parseopts = get_diff_parseopts(options);
}
static const char diff_status_letters[] = {
@@ -4821,8 +4817,6 @@ void diff_setup_done(struct diff_options *options)
options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
options->filter &= ~options->filter_not;
}
-
- FREE_AND_NULL(options->parseopts);
}
int parse_long_opt(const char *opt, const char **argv,
@@ -5695,21 +5689,27 @@ static struct option *get_diff_parseopts(struct diff_options *options)
struct option *add_diff_options(const struct option *parseopts,
struct diff_options *options)
{
- return parse_options_concat(parseopts, options->parseopts);
+ struct option *diff_parseopts = get_diff_parseopts(options);
+ struct option *result = parse_options_concat(parseopts, diff_parseopts);
+ free(diff_parseopts);
+ return result;
}
int diff_opt_parse(struct diff_options *options,
const char **av, int ac, const char *prefix)
{
+ struct option *diff_parseopts = get_diff_parseopts(options);
+
if (!prefix)
prefix = "";
- ac = parse_options(ac, av, prefix, options->parseopts, NULL,
+ ac = parse_options(ac, av, prefix, diff_parseopts, NULL,
PARSE_OPT_KEEP_DASHDASH |
PARSE_OPT_KEEP_UNKNOWN_OPT |
PARSE_OPT_NO_INTERNAL_HELP |
PARSE_OPT_ONE_SHOT |
PARSE_OPT_STOP_AT_NON_OPTION);
+ free(diff_parseopts);
return ac;
}
@@ -6518,7 +6518,6 @@ void diff_free(struct diff_options *options)
diff_free_file(options);
diff_free_ignore_regex(options);
clear_pathspec(&options->pathspec);
- FREE_AND_NULL(options->parseopts);
}
void diff_flush(struct diff_options *options)
--
2.38.1
next prev parent reply other threads:[~2022-11-30 18:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 18:01 [PATCH 0/3] diff: build parseopts array on demand René Scharfe
2022-11-30 18:03 ` [PATCH 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 14:11 ` ZheNing Hu
2022-11-30 18:04 ` [PATCH 2/3] diff: let prep_parse_options() return parseopt array René Scharfe
2022-11-30 18:04 ` René Scharfe [this message]
2022-12-01 1:25 ` [PATCH 3/3] diff: remove parseopts member of struct diff_options Junio C Hamano
2022-12-01 7:52 ` René Scharfe
2022-12-01 21:56 ` Junio C Hamano
2022-12-01 22:45 ` René Scharfe
2022-12-01 1:02 ` [PATCH 0/3] diff: build parseopts array on demand Junio C Hamano
2022-12-01 13:39 ` [PATCH v2 " René Scharfe
2022-12-01 13:42 ` [PATCH v2 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 13:43 ` [PATCH v2 2/3] diff: let prep_parse_options() return parseopt array René Scharfe
2022-12-01 13:44 ` [PATCH v2 3/3] diff: remove parseopts member from struct diff_options René Scharfe
2022-12-01 16:54 ` [PATCH v2 0/3] diff: build parseopts array on demand Ævar Arnfjörð Bjarmason
2022-12-01 19:01 ` René Scharfe
2022-12-01 19:19 ` Eric Sunshine
2022-12-01 19:43 ` René Scharfe
2022-12-01 23:00 ` Ævar Arnfjörð Bjarmason
2022-12-01 22:45 ` [PATCH v3 " René Scharfe
2022-12-01 22:49 ` [PATCH v3 1/3] diff: factor out add_diff_options() René Scharfe
2022-12-01 22:51 ` [PATCH v3 2/3] diff: use add_diff_options() in diff_opt_parse() René Scharfe
2022-12-01 22:53 ` [PATCH v3 3/3] diff: remove parseopts member from struct diff_options René Scharfe
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d226d3bc-fb15-58a4-f516-bda51a912228@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).