log: fix a memory leak in "git show <revision>..."
Fix a memory leak in code added in5d7eeee2ac
(git-show: grok blobs, trees and tags, too, 2006-12-14). As we iterate over a "<revision>..." command-line and encounter ad OBJ_COMMIT we want to use our "struct rev_info", but with a "pending" array of one element: the one commit we're showing in the loop. To do this5d7eeee2ac
saved away a pointer to rev.pending.objects and rev.pending.nr for its iteration. We'd then clobber those (and alloc) when we needed to show an OBJ_COMMIT. We'd therefore leak the "rev.pending" we started out with, and only free the new "rev.pending" in the "OBJ_COMMIT" case arm as prepare_revision_walk() would draw it down. Let's fix this memory leak. Now when we encounter an OBJ_COMMIT we save away the "rev.pending" before clearing it. We then add a single commit to it, which our indirect invocation of prepare_revision_walk() will remove. After that we restore the "rev.pending". Our "rev.pending" will then get free'd by the release_revisions() added inf6bfea0ad0
(revisions API users: use release_revisions() in builtin/log.c, 2022-04-13) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c541e77cf8
commit
055e57b7b2
@ -743,11 +743,17 @@ int cmd_show(int argc, const char **argv, const char *prefix)
|
|||||||
rev.shown_one = 1;
|
rev.shown_one = 1;
|
||||||
break;
|
break;
|
||||||
case OBJ_COMMIT:
|
case OBJ_COMMIT:
|
||||||
|
{
|
||||||
|
struct object_array old;
|
||||||
|
|
||||||
|
memcpy(&old, &rev.pending, sizeof(old));
|
||||||
rev.pending.nr = rev.pending.alloc = 0;
|
rev.pending.nr = rev.pending.alloc = 0;
|
||||||
rev.pending.objects = NULL;
|
rev.pending.objects = NULL;
|
||||||
add_object_array(o, name, &rev.pending);
|
add_object_array(o, name, &rev.pending);
|
||||||
ret = cmd_log_walk_no_free(&rev);
|
ret = cmd_log_walk_no_free(&rev);
|
||||||
|
memcpy(&rev.pending, &old, sizeof(rev.pending));
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
ret = error(_("unknown type: %d"), o->type);
|
ret = error(_("unknown type: %d"), o->type);
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
test_description="The Git C functions aren't broken by setlocale(3)"
|
test_description="The Git C functions aren't broken by setlocale(3)"
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./lib-gettext.sh
|
. ./lib-gettext.sh
|
||||||
|
|
||||||
test_expect_success 'git show a ISO-8859-1 commit under C locale' '
|
test_expect_success 'git show a ISO-8859-1 commit under C locale' '
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
test_description='Try various core-level commands in subdirectory.
|
test_description='Try various core-level commands in subdirectory.
|
||||||
'
|
'
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@ test_description='Examples from the git-notes man page
|
|||||||
|
|
||||||
Make sure the manual is not full of lies.'
|
Make sure the manual is not full of lies.'
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect_success 'setup' '
|
test_expect_success 'setup' '
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
test_description='Test ref-filter and pretty APIs for commit and tag messages using CRLF'
|
test_description='Test ref-filter and pretty APIs for commit and tag messages using CRLF'
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
LIB_CRLF_BRANCHES=""
|
LIB_CRLF_BRANCHES=""
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
test_description='remerge-diff handling'
|
test_description='remerge-diff handling'
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
# This test is ort-specific
|
# This test is ort-specific
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
test_description='git show'
|
test_description='git show'
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
|
@ -5,6 +5,7 @@ test_description='pre-commit and pre-merge-commit hooks'
|
|||||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||||
|
|
||||||
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect_success 'root commit' '
|
test_expect_success 'root commit' '
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
test_description='git svn authorship'
|
test_description='git svn authorship'
|
||||||
|
|
||||||
TEST_FAILS_SANITIZE_LEAK=true
|
|
||||||
. ./lib-git-svn.sh
|
. ./lib-git-svn.sh
|
||||||
|
|
||||||
test_expect_success 'setup svn repository' '
|
test_expect_success 'setup svn repository' '
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
test_description='git svn dcommit --interactive series'
|
test_description='git svn dcommit --interactive series'
|
||||||
|
|
||||||
TEST_FAILS_SANITIZE_LEAK=true
|
|
||||||
. ./lib-git-svn.sh
|
. ./lib-git-svn.sh
|
||||||
|
|
||||||
test_expect_success 'initialize repo' '
|
test_expect_success 'initialize repo' '
|
||||||
|
Loading…
Reference in New Issue
Block a user