2005-11-17 05:32:44 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='git apply handling binary patches
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
'
|
2020-11-18 23:44:27 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2024-04-22 22:54:05 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2005-11-17 05:32:44 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2012-08-25 05:48:55 +00:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
cat >file1 <<-\EOF &&
|
|
|
|
A quick brown fox jumps over the lazy dog.
|
|
|
|
A tiny little penguin runs around in circles.
|
|
|
|
There is a flag with Linux written on it.
|
|
|
|
A slow black-and-white panda just sits there,
|
|
|
|
munching on his bamboo.
|
|
|
|
EOF
|
|
|
|
cat file1 >file2 &&
|
|
|
|
cat file1 >file4 &&
|
|
|
|
|
2010-03-20 08:29:11 +00:00
|
|
|
git update-index --add --remove file1 file2 file4 &&
|
2012-08-25 05:48:55 +00:00
|
|
|
git commit -m "Initial Version" 2>/dev/null &&
|
2010-03-20 08:29:11 +00:00
|
|
|
|
|
|
|
git checkout -b binary &&
|
2013-10-29 01:23:03 +00:00
|
|
|
perl -pe "y/x/\000/" <file1 >file3 &&
|
2010-03-20 08:29:11 +00:00
|
|
|
cat file3 >file4 &&
|
|
|
|
git add file2 &&
|
2013-10-29 01:23:03 +00:00
|
|
|
perl -pe "y/\000/v/" <file3 >file1 &&
|
2010-03-20 08:29:11 +00:00
|
|
|
rm -f file2 &&
|
|
|
|
git update-index --add --remove file1 file2 file3 file4 &&
|
2012-08-25 05:48:55 +00:00
|
|
|
git commit -m "Second Version" &&
|
2010-03-20 08:29:11 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git diff-tree -p main binary >B.diff &&
|
|
|
|
git diff-tree -p -C main binary >C.diff &&
|
2010-03-20 08:29:11 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git diff-tree -p --binary main binary >BF.diff &&
|
|
|
|
git diff-tree -p --binary -C main binary >CF.diff &&
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 18:39:17 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git diff-tree -p --full-index main binary >B-index.diff &&
|
|
|
|
git diff-tree -p -C --full-index main binary >C-index.diff &&
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 18:39:17 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
|
2012-08-25 05:48:55 +00:00
|
|
|
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 18:39:17 +00:00
|
|
|
git init other-repo &&
|
2012-08-25 05:48:55 +00:00
|
|
|
(
|
|
|
|
cd other-repo &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git fetch .. main &&
|
2012-08-25 05:48:55 +00:00
|
|
|
git reset --hard FETCH_HEAD
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 18:39:17 +00:00
|
|
|
)
|
2012-08-25 05:48:55 +00:00
|
|
|
'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
test_expect_success 'stat binary diff -- should not fail.' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --stat --summary B.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2012-08-25 05:48:55 +00:00
|
|
|
test_expect_success 'stat binary -p0 diff -- should not fail.' '
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout main &&
|
2012-08-25 05:48:55 +00:00
|
|
|
git apply --stat -p0 B0.diff
|
|
|
|
'
|
|
|
|
|
2005-11-17 05:32:44 +00:00
|
|
|
test_expect_success 'stat binary diff (copy) -- should not fail.' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --stat --summary C.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'check binary diff -- should fail.' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --check B.diff'
|
2008-02-01 09:50:53 +00:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff (copy) -- should fail.' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --check C.diff'
|
2008-02-01 09:50:53 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'check incomplete binary diff with replacement -- should fail.' '
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout main &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --check --allow-binary-replacement B.diff
|
2008-02-01 09:50:53 +00:00
|
|
|
'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success \
|
|
|
|
'check incomplete binary diff with replacement (copy) -- should fail.' '
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout main &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --check --allow-binary-replacement C.diff
|
2008-02-01 09:50:53 +00:00
|
|
|
'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff with replacement.' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --check --allow-binary-replacement BF.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
test_expect_success 'check binary diff with replacement (copy).' \
|
2020-11-18 23:44:27 +00:00
|
|
|
'git checkout main &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --check --allow-binary-replacement CF.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
# Now we start applying them.
|
|
|
|
|
|
|
|
do_reset () {
|
2008-02-01 09:50:53 +00:00
|
|
|
rm -f file? &&
|
2008-09-03 08:59:29 +00:00
|
|
|
git reset --hard &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -f main
|
2005-11-17 05:32:44 +00:00
|
|
|
}
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply B.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --index B.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply C.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
|
|
'do_reset &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git apply --index C.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
apply: don't segfault on binary files with missing data
Usually when applying a binary diff generated without
--binary, it will be rejected early, as we don't even have
the full sha1 of the pre- and post-images.
However, if the diff is generated with --full-index (but not
--binary), then we will actually try to apply it. If we have
the postimage blob, then we can take a shortcut and never
even look at the binary diff at all (e.g., this can happen
when rebasing changes within a repository).
If we don't have the postimage blob, though, we try to look
at the actual fragments, of which there are none, and get a
segfault. This patch checks explicitly for that case and
complains to the user instead of segfaulting. We need to
keep the check at a low level so that the "shortcut" case
above continues to work.
We also add a test that demonstrates the segfault. While
we're at it, let's also explicitly test the shortcut case.
Reported-by: Rafaël Carré <rafael.carre@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 18:39:17 +00:00
|
|
|
test_expect_success 'apply binary diff with full-index' '
|
|
|
|
do_reset &&
|
|
|
|
git apply B-index.diff
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply binary diff with full-index (copy)' '
|
|
|
|
do_reset &&
|
|
|
|
git apply C-index.diff
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply full-index binary diff in new repo' '
|
|
|
|
(cd other-repo &&
|
|
|
|
do_reset &&
|
|
|
|
test_must_fail git apply ../B-index.diff)
|
|
|
|
'
|
|
|
|
|
2006-09-07 05:45:21 +00:00
|
|
|
test_expect_success 'apply binary diff without replacement.' \
|
2008-02-01 09:50:53 +00:00
|
|
|
'do_reset &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply BF.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2006-09-07 05:45:21 +00:00
|
|
|
test_expect_success 'apply binary diff without replacement (copy).' \
|
2008-02-01 09:50:53 +00:00
|
|
|
'do_reset &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply CF.diff'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
test_expect_success 'apply binary diff.' \
|
2008-02-01 09:50:53 +00:00
|
|
|
'do_reset &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --allow-binary-replacement --index BF.diff &&
|
|
|
|
test -z "$(git diff --name-status binary)"'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
|
|
|
test_expect_success 'apply binary diff (copy).' \
|
2008-02-01 09:50:53 +00:00
|
|
|
'do_reset &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --allow-binary-replacement --index CF.diff &&
|
|
|
|
test -z "$(git diff --name-status binary)"'
|
2005-11-17 05:32:44 +00:00
|
|
|
|
2012-08-25 05:48:55 +00:00
|
|
|
test_expect_success 'apply binary -p0 diff' '
|
|
|
|
do_reset &&
|
|
|
|
git apply -p0 --index B0.diff &&
|
|
|
|
test -z "$(git diff --name-status binary -- file3)"
|
|
|
|
'
|
|
|
|
|
apply: keep buffer/size pair in sync when parsing binary hunks
We parse through binary hunks by looping through the buffer with code
like:
llen = linelen(buffer, size);
...do something with the line...
buffer += llen;
size -= llen;
However, before we enter the loop, there is one call that increments
"buffer" but forgets to decrement "size". As a result, our "size" is off
by the length of that line, and subsequent calls to linelen() may look
past the end of the buffer for a newline.
The fix is easy: we just need to decrement size as we do elsewhere.
This bug goes all the way back to 0660626caf (binary diff: further
updates., 2006-05-05). Presumably nobody noticed because it only
triggers if the patch is corrupted, and even then we are often "saved"
by luck. We use a strbuf to store the incoming patch, so we overallocate
there, plus we add a 16-byte run of NULs as slop for memory comparisons.
So if this happened accidentally, the common case is that we'd just read
a few uninitialized bytes from the end of the strbuf before producing
the expected "this patch is corrupted" error complaint.
However, it is possible to carefully construct a case which reads off
the end of the buffer. The included test does so. It will pass both
before and after this patch when run normally, but using a tool like
ASan shows that we get an out-of-bounds read before this patch, but not
after.
Reported-by: Xingman Chen <xichixingman@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-10 01:01:52 +00:00
|
|
|
test_expect_success 'reject truncated binary diff' '
|
|
|
|
do_reset &&
|
|
|
|
|
|
|
|
# this length is calculated to get us very close to
|
|
|
|
# the 8192-byte strbuf we will use to read in the patch.
|
|
|
|
test-tool genrandom foo 6205 >file1 &&
|
|
|
|
git diff --binary >patch &&
|
|
|
|
|
|
|
|
# truncate the patch at the second "literal" line,
|
|
|
|
# but exclude the trailing newline. We must use perl
|
|
|
|
# for this, since tools like "sed" cannot reliably
|
|
|
|
# produce output without the trailing newline.
|
|
|
|
perl -pe "
|
|
|
|
if (/^literal/ && \$count++ >= 1) {
|
|
|
|
chomp;
|
|
|
|
print;
|
|
|
|
exit 0;
|
|
|
|
}
|
|
|
|
" <patch >patch.trunc &&
|
|
|
|
|
|
|
|
do_reset &&
|
|
|
|
test_must_fail git apply patch.trunc
|
|
|
|
'
|
2005-11-17 05:32:44 +00:00
|
|
|
test_done
|