From: Alex Henrie <alexhenrie24@gmail.com>
To: git@vger.kernel.org, paulus@ozlabs.org
Cc: Alex Henrie <alexhenrie24@gmail.com>
Subject: [PATCH v2 1/4] log: fix memory leak if --graph is passed multiple times
Date: Thu, 10 Feb 2022 09:52:06 -0700 [thread overview]
Message-ID: <20220210165209.310930-1-alexhenrie24@gmail.com> (raw)
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
v2: introduce graph_clear function
---
graph.c | 12 ++++++++++++
graph.h | 5 +++++
revision.c | 1 +
3 files changed, 18 insertions(+)
diff --git a/graph.c b/graph.c
index e3828eb8f2..568b6e7cd4 100644
--- a/graph.c
+++ b/graph.c
@@ -401,6 +401,18 @@ struct git_graph *graph_init(struct rev_info *opt)
return graph;
}
+void graph_clear(struct git_graph *graph)
+{
+ if (!graph)
+ return;
+
+ free(graph->columns);
+ free(graph->new_columns);
+ free(graph->mapping);
+ free(graph->old_mapping);
+ free(graph);
+}
+
static void graph_update_state(struct git_graph *graph, enum graph_state s)
{
graph->prev_state = graph->state;
diff --git a/graph.h b/graph.h
index 8313e293c7..e88632a014 100644
--- a/graph.h
+++ b/graph.h
@@ -139,6 +139,11 @@ void graph_set_column_colors(const char **colors, unsigned short colors_max);
*/
struct git_graph *graph_init(struct rev_info *opt);
+/*
+ * Free a struct git_graph.
+ */
+void graph_clear(struct git_graph *graph);
+
/*
* Update a git_graph with a new commit.
* This will cause the graph to begin outputting lines for the new commit
diff --git a/revision.c b/revision.c
index ad4286fbdd..816061f3d9 100644
--- a/revision.c
+++ b/revision.c
@@ -2426,6 +2426,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--graph")) {
revs->topo_order = 1;
revs->rewrite_parents = 1;
+ graph_clear(revs->graph);
revs->graph = graph_init(revs);
} else if (!strcmp(arg, "--encode-email-headers")) {
revs->encode_email_headers = 1;
--
2.32.0.2645.gc109162a1f
next reply other threads:[~2022-02-10 16:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 16:52 Alex Henrie [this message]
2022-02-10 16:52 ` [PATCH v2 2/4] log: add a --no-graph option Alex Henrie
2022-02-10 16:52 ` [PATCH v2 3/4] log: add a log.graph config option Alex Henrie
2022-02-10 16:52 ` [PATCH v2 4/4] gitk: pass --no-graph to `git log` Alex Henrie
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=20220210165209.310930-1-alexhenrie24@gmail.com \
--to=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=paulus@ozlabs.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.
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).