From: René Scharfe <l.s.r@web.de>
Date: Fri, 19 Jun 2020 13:14:19 +0000 (+0200)
Subject: pull: plug minor memory leak after using is_descendant_of()
X-Git-Tag: v2.28.0-rc0~31^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c9a4f638a53c4b54d5bf91e179d5d915e698272;p=thirdparty%2Fgit.git

pull: plug minor memory leak after using is_descendant_of()

cmd_pull() builds a commit_list to pass a single potential ancestor to
is_descendant_of().  The latter leaves the list intact.  Release the
allocated memory after the call.

Leaking in cmd_*() isn't a big deal, but sets a bad example for other
users of is_descendant_of().

Signed-off-by: René Scharfe <l.s.r@web.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/pull.c b/builtin/pull.c
index 3e624d1e00..06e5bd48b5 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -994,6 +994,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 				opt_ff = "--ff-only";
 				ret = run_merge();
 			}
+			free_commit_list(list);
 		}
 		ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);