mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
27472b5195
Fix a memory leak where "cat-file" will leak the "path" member. Seee5fba602e5(textconv: support for cat_file, 2010-06-15) for the code that introduced the offending get_oid_with_context() call (called get_sha1_with_context() at the time). As a result we can mark several tests as passing with SANITIZE=leak using "TEST_PASSES_SANITIZE_LEAK=true". As noted indc944b65f1(get_sha1_with_context: dynamically allocate oc->path, 2017-05-19) callers must free the "path" member. That same commit added the relevant free() to this function, but we weren't catching cases where we'd return early. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
2 KiB
Bash
Executable file
71 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git cat-file filters support'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup ' '
|
|
echo "*.txt eol=crlf diff=txt" >.gitattributes &&
|
|
echo "hello" | append_cr >world.txt &&
|
|
git add .gitattributes world.txt &&
|
|
test_tick &&
|
|
git commit -m "Initial commit"
|
|
'
|
|
|
|
has_cr () {
|
|
tr '\015' Q <"$1" | grep Q >/dev/null
|
|
}
|
|
|
|
test_expect_success 'no filters with `git show`' '
|
|
git show HEAD:world.txt >actual &&
|
|
! has_cr actual
|
|
|
|
'
|
|
|
|
test_expect_success 'no filters with cat-file' '
|
|
git cat-file blob HEAD:world.txt >actual &&
|
|
! has_cr actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --filters converts to worktree version' '
|
|
git cat-file --filters HEAD:world.txt >actual &&
|
|
has_cr actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --filters --path=<path> works' '
|
|
sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
|
|
git cat-file --filters --path=world.txt $sha1 >actual &&
|
|
has_cr actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --textconv --path=<path> works' '
|
|
sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
|
|
test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
|
|
git cat-file --textconv --path=hello.txt $sha1 >rot13 &&
|
|
test uryyb = "$(cat rot13 | remove_cr)"
|
|
'
|
|
|
|
test_expect_success '--path=<path> complains without --textconv/--filters' '
|
|
sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
|
|
test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err &&
|
|
test_must_be_empty actual &&
|
|
grep "path.*needs.*filters" err
|
|
'
|
|
|
|
test_expect_success '--textconv/--filters complain without path' '
|
|
test_must_fail git cat-file --textconv HEAD &&
|
|
test_must_fail git cat-file --filters HEAD
|
|
'
|
|
|
|
test_expect_success 'cat-file --textconv --batch works' '
|
|
sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
|
|
test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
|
|
printf "%s hello.txt\n%s hello\n" $sha1 $sha1 |
|
|
git cat-file --textconv --batch >actual &&
|
|
printf "%s blob 6\nuryyb\r\n\n%s blob 6\nhello\n\n" \
|
|
$sha1 $sha1 >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|