mirror of
https://github.com/git/git.git
synced 2024-12-01 14:03:34 +08: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>
131 lines
3.1 KiB
Bash
Executable File
131 lines
3.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git cat-file textconv support'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
cat >helper <<'EOF'
|
|
#!/bin/sh
|
|
grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
|
|
sed 's/^bin: /converted: /' "$1"
|
|
EOF
|
|
chmod +x helper
|
|
|
|
test_expect_success 'setup ' '
|
|
echo "bin: test" >one.bin &&
|
|
test_ln_s_add one.bin symlink.bin &&
|
|
git add . &&
|
|
GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
|
|
echo "bin: test version 2" >one.bin &&
|
|
GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
|
|
'
|
|
|
|
test_expect_success 'usage: <bad rev>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: Not a valid object name HEAD2
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'usage: <bad rev>:<bad path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: invalid object name '\''HEAD2'\''.
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'usage: <rev>:<bad path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: path '\''two.bin'\'' does not exist in '\''HEAD'\''
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
|
|
test_expect_success 'usage: <rev> with no <path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: <object>:<path> required, only <object> '\''HEAD'\'' given
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
|
|
test_expect_success 'usage: <bad rev>:<good (in HEAD) path>' '
|
|
cat >expect <<-\EOF &&
|
|
fatal: invalid object name '\''HEAD2'\''.
|
|
EOF
|
|
test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
bin: test version 2
|
|
EOF
|
|
|
|
test_expect_success 'no filter specified' '
|
|
git cat-file --textconv :one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'setup textconv filters' '
|
|
echo "*.bin diff=test" >.gitattributes &&
|
|
git config diff.test.textconv ./helper &&
|
|
git config diff.test.cachetextconv false
|
|
'
|
|
|
|
test_expect_success 'cat-file without --textconv' '
|
|
git cat-file blob :one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
bin: test
|
|
EOF
|
|
|
|
test_expect_success 'cat-file without --textconv on previous commit' '
|
|
git cat-file -p HEAD^:one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
converted: test version 2
|
|
EOF
|
|
|
|
test_expect_success 'cat-file --textconv on last commit' '
|
|
git cat-file --textconv :one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
converted: test
|
|
EOF
|
|
|
|
test_expect_success 'cat-file --textconv on previous commit' '
|
|
git cat-file --textconv HEAD^:one.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'cat-file without --textconv (symlink)' '
|
|
printf "%s" "one.bin" >expected &&
|
|
git cat-file blob :symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
|
|
test_expect_success 'cat-file --textconv on index (symlink)' '
|
|
git cat-file --textconv :symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'cat-file --textconv on HEAD (symlink)' '
|
|
git cat-file --textconv HEAD:symlink.bin >result &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_done
|