mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
The "checkout" command is one of the main sources of leaks in the test
suite, let's fix the common ones by not leaking from the "struct
branch_info".
Doing this is rather straightforward, albeit verbose, we need to
xstrdup() constant strings going into the struct, and free() the ones
we clobber as we go along.
This also means that we can delete previous partial leak fixes in this
area, i.e. the "path_to_free" accounting added by 96ec7b1e70
(Convert
resolve_ref+xstrdup to new resolve_refdup function, 2011-12-13).
There was some discussion about whether "we should retain the "const
char *" here and cast at free() time, or have it be a "char *". Since
this is not a public API with any sort of API boundary let's use
"char *", as is already being done for the "refname" member of the
same struct.
The tests to mark as passing were found with:
rm .prove; GIT_SKIP_TESTS=t0027 prove -j8 --state=save t[0-9]*.sh :: --immediate
# apply & compile this change
prove -j8 --state=failed :: --immediate
I.e. the ones that were newly passing when the --state=failed command
was run. I left out "t3040-subprojects-basic.sh" and
"t4131-apply-fake-ancestor.sh" to to optimization-level related
differences similar to the ones noted in[1], except that these would
be something the current 'linux-leaks' job would run into.
1. https://lore.kernel.org/git/cover-v3-0.6-00000000000-20211022T175227Z-avarab@gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
150 lines
3.4 KiB
Bash
Executable file
150 lines
3.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git grep in binary files'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' "
|
|
echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
|
|
git add a &&
|
|
git commit -m.
|
|
"
|
|
|
|
test_expect_success 'git grep ina a' '
|
|
echo Binary file a matches >expect &&
|
|
git grep ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -ah ina a' '
|
|
git grep -ah ina a >actual &&
|
|
test_cmp a actual
|
|
'
|
|
|
|
test_expect_success 'git grep -I ina a' '
|
|
test_must_fail git grep -I ina a >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'git grep -c ina a' '
|
|
echo a:1 >expect &&
|
|
git grep -c ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -l ina a' '
|
|
echo a >expect &&
|
|
git grep -l ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -L bar a' '
|
|
echo a >expect &&
|
|
git grep -L bar a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -q ina a' '
|
|
git grep -q ina a >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'git grep -F ile a' '
|
|
git grep -F ile a
|
|
'
|
|
|
|
test_expect_success 'git grep -Fi iLE a' '
|
|
git grep -Fi iLE a
|
|
'
|
|
|
|
# This test actually passes on platforms where regexec() supports the
|
|
# flag REG_STARTEND.
|
|
test_expect_success 'git grep ile a' '
|
|
git grep ile a
|
|
'
|
|
|
|
test_expect_failure 'git grep .fi a' '
|
|
git grep .fi a
|
|
'
|
|
|
|
test_expect_success 'grep respects binary diff attribute' '
|
|
echo text >t &&
|
|
git add t &&
|
|
echo t:text >expect &&
|
|
git grep text t >actual &&
|
|
test_cmp expect actual &&
|
|
echo "t -diff" >.gitattributes &&
|
|
echo "Binary file t matches" >expect &&
|
|
git grep text t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --cached respects binary diff attribute' '
|
|
git grep --cached text t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --cached respects binary diff attribute (2)' '
|
|
git add .gitattributes &&
|
|
rm .gitattributes &&
|
|
git grep --cached text t >actual &&
|
|
test_when_finished "git rm --cached .gitattributes" &&
|
|
test_when_finished "git checkout .gitattributes" &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep revision respects binary diff attribute' '
|
|
git commit -m new &&
|
|
echo "Binary file HEAD:t matches" >expect &&
|
|
git grep text HEAD -- t >actual &&
|
|
test_when_finished "git reset HEAD^" &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep respects not-binary diff attribute' '
|
|
echo binQary | q_to_nul >b &&
|
|
git add b &&
|
|
echo "Binary file b matches" >expect &&
|
|
git grep bin b >actual &&
|
|
test_cmp expect actual &&
|
|
echo "b diff" >.gitattributes &&
|
|
echo "b:binQary" >expect &&
|
|
git grep bin b >actual.raw &&
|
|
nul_to_q <actual.raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >nul_to_q_textconv <<'EOF'
|
|
#!/bin/sh
|
|
"$PERL_PATH" -pe 'y/\000/Q/' < "$1"
|
|
EOF
|
|
chmod +x nul_to_q_textconv
|
|
|
|
test_expect_success 'setup textconv filters' '
|
|
echo a diff=foo >.gitattributes &&
|
|
git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
|
|
'
|
|
|
|
test_expect_success 'grep does not honor textconv' '
|
|
test_must_fail git grep Qfile
|
|
'
|
|
|
|
test_expect_success 'grep --textconv honors textconv' '
|
|
echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
|
|
git grep --textconv Qfile >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --no-textconv does not honor textconv' '
|
|
test_must_fail git grep --no-textconv Qfile
|
|
'
|
|
|
|
test_expect_success 'grep --textconv blob honors textconv' '
|
|
echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
|
|
git grep --textconv Qfile HEAD:a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|