diff options
| author |  René Scharfe <l.s.r@web.de> | 2020-06-19 15:14:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-06-19 12:17:21 -0700 |
| commit | 0c9a4f638a53c4b54d5bf91e179d5d915e698272 (patch) | |
| tree | 7331eafa588d49533acf4776232b1db69f4b006a /builtin/pull.c | |
| parent | Git 2.26.2 (diff) | |
| download | tgif-0c9a4f638a53c4b54d5bf91e179d5d915e698272.tar.xz | |
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>
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |