log: fix memory leak if --graph is passed multiple times

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/graph.c b/graph.c
index e3828eb8f2309048353524e4132d33dd6cda3555..568b6e7cd41512d17cc68e0595675ee858165164 100644 (file)
--- 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 8313e293c78d8e72fd02dbda94f28a4df80eee05..e88632a0140f70ef25535e23120c898c007b8349 100644 (file)
--- 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 ad4286fbdde521c3eebc048577bc61a341c9e6ee..816061f3d9d4ffa42a61921c18f45221bdbcea42 100644 (file)
--- 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;