From 03b69c7606267bc978c69cf88fcd7a8edf8175bc Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 11 Dec 2007 22:59:55 +0100 Subject: [PATCH] Fix small memory leaks induced by diff_tree_setup_paths Run diff_tree_release_paths in the appropriate places, and add a test to avoid NULL dereference. Better safe than sorry. Signed-off-by: Mike Hommey Signed-off-by: Junio C Hamano --- builtin-blame.c | 4 +++- builtin-reset.c | 1 + tree-diff.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/builtin-blame.c b/builtin-blame.c index eda79d0f00..5466d01f9a 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -388,6 +388,7 @@ static struct origin *find_origin(struct scoreboard *sb, } } diff_flush(&diff_opts); + diff_tree_release_paths(&diff_opts); if (porigin) { /* * Create a freestanding copy that is not part of @@ -444,6 +445,7 @@ static struct origin *find_rename(struct scoreboard *sb, } } diff_flush(&diff_opts); + diff_tree_release_paths(&diff_opts); return porigin; } @@ -1165,7 +1167,7 @@ static int find_copy_in_parent(struct scoreboard *sb, } } diff_flush(&diff_opts); - + diff_tree_release_paths(&diff_opts); return retval; } diff --git a/builtin-reset.c b/builtin-reset.c index 4c61025aae..713c2d5346 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -158,6 +158,7 @@ static int read_from_tree(const char *prefix, const char **argv, return 1; diffcore_std(&opt); diff_flush(&opt); + diff_tree_release_paths(&opt); if (!index_was_discarded) /* The index is still clobbered from do_diff_cache() */ diff --git a/tree-diff.c b/tree-diff.c index aa0a100295..e1e2e6c6ce 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -326,6 +326,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co die("unable to set up diff options to follow renames"); diff_tree(t1, t2, base, &diff_opts); diffcore_std(&diff_opts); + diff_tree_release_paths(&diff_opts); /* Go through the new set of filepairing, and see if we find a more interesting one */ for (i = 0; i < q->nr; i++) { @@ -342,6 +343,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co choice = p; /* Update the path we use from now on.. */ + diff_tree_release_paths(opt); opt->paths[0] = xstrdup(p->one->path); diff_tree_setup_paths(opt->paths, opt); break; -- 2.11.4.GIT