kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "patch: fix pch_context() for unified diffs with no leading context"

Browse source 
This reverts commit f97b6a8f84, as it
turns out our fuzz implementation is just too naive.  We can have more
leading context than trailing context and vice-versa, so we can't really
assume they're the same.

Restore the previous bug and we can work on it post-branch.

Reported by:	cy
This commit is contained in:
Kyle Evans 2025-08-30 17:01:27 -05:00
parent ae7f8da8bf
commit fb37e38fbe
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.bin/patch/pch.c
View file

@ -1054,7 +1054,7 @@ hunk_done:
p_end = fillnew;
malformed();
}
if (ch != ' ' && context >= 0) {
if (ch != ' ' && context > 0) {
if (context < p_context)
p_context = context;
context = -1000;

21
usr.bin/patch/tests/unified_patch_test.sh
View file

@ -25,26 +25,6 @@
# SUCH DAMAGE.
#
atf_test_case badfuzz
badfuzz_head()
{
atf_set "descr" "Test for patch(1) erroneously fuzzing away action lines"
}
badfuzz_body()
{
# PR 250511 demonstrates a scenario where patch(1) will happily apply a
# patch into the wrong location if we have some lines that are still
# similar in the trailing context. In the following example, it would
# actually replace the underscore before the second series of B\nC\nO
# with "Z", when the patch should have been rejected instead.
printf "A\nB\nC\nO\n_\nB\nC\nO\n" > file.orig
printf "Z\nB\nC\nO\n_\nB\nC\nO\n" > file
printf "OK\nDIFF1\nDIFF2\n\n_\nB\nC\nO\n" > file.newer
atf_check -s not-exit:0 -o save:file.patch diff -u3 file.orig file
atf_check -s not-exit:0 -o not-empty patch file.newer file.patch
}
atf_test_case basic
basic_body()
{
@ -198,7 +178,6 @@ EOF
atf_init_test_cases()
{
atf_add_test_case badfuzz
atf_add_test_case basic
atf_add_test_case limited_ctx
atf_add_test_case file_creation