last-modified: fix memory leak when more than one revision is given

When more than one revision is given, the function
populate_paths_from_revs() leaks a `struct pathspec`. Plug it.

Signed-off-by: Toon Claes <toon@iotcl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/last-modified.c b/builtin/last-modified.c
index 7d95244e3f0b502018735faa6e21fff623d37982..06e3f79aec38084ed8c72abc45378f799260d637 100644 (file)
--- a/builtin/last-modified.c
+++ b/builtin/last-modified.c
@@ -123,7 +123,7 @@ static void add_path_from_diff(struct diff_queue_struct *q,
 
 static int populate_paths_from_revs(struct last_modified *lm)
 {
-       int num_interesting = 0;
+       int num_interesting = 0, ret = 0;
        struct diff_options diffopt;
 
        /*
@@ -145,16 +145,20 @@ static int populate_paths_from_revs(struct last_modified *lm)
                if (obj->item->flags & UNINTERESTING)
                        continue;
 
-               if (num_interesting++)
-                       return error(_("last-modified can only operate on one revision at a time"));
+               if (num_interesting++) {
+                       ret = error(_("last-modified can only operate on one revision at a time"));
+                       goto out;
+               }
 
                diff_tree_oid(lm->rev.repo->hash_algo->empty_tree,
                              &obj->item->oid, "", &diffopt);
                diff_flush(&diffopt);
        }
+
+out:
        clear_pathspec(&diffopt.pathspec);
 
-       return 0;
+       return ret;
 }
 
 static void last_modified_emit(struct last_modified *lm,