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 <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-blame.c b/builtin-blame.c
index eda79d0f00f5696f6436b67390bf84f8b2f7cb9c..5466d01f9a5917dbba4108669ee4513b581ff2c9 100644 (file)
--- 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_flush(&diff_opts);

+       diff_tree_release_paths(&diff_opts);

        if (porigin) {
                /*
                 * Create a freestanding copy that is not part of
        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_flush(&diff_opts);

+       diff_tree_release_paths(&diff_opts);

        return porigin;
 }
 
        return porigin;
 }
 


@@ -1165,7 +1167,7 @@ static int find_copy_in_parent(struct scoreboard *sb,
                }
        }
        diff_flush(&diff_opts);
                }
        }
        diff_flush(&diff_opts);

-
+       diff_tree_release_paths(&diff_opts);

        return retval;
 }
 
        return retval;
 }
 

diff --git a/builtin-reset.c b/builtin-reset.c
index 4c61025aaef96ae9f8bcabe3fd4ad6c0fc2beba3..713c2d5346e8dc7e502beffc256bfdcad9da6ad5 100644 (file)
--- 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);
                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() */
 
        if (!index_was_discarded)
                /* The index is still clobbered from do_diff_cache() */

diff --git a/tree-diff.c b/tree-diff.c
index aa0a100295c5c48483c6bfbbfc0105b70680becc..e1e2e6c6ce3c4effffb26e9aed7c6bdd2b00a5ae 100644 (file)
--- 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);
                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++) {
 
        /* 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.. */
                        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;
                        opt->paths[0] = xstrdup(p->one->path);
                        diff_tree_setup_paths(opt->paths, opt);
                        break;