system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

patch: fix locate_hunk in empty files

Browse source 
if `first_guess' is zero then main() assumes that locate_hunk has failed
and aborts the patch operation.  Instead, make sure to return 1 (the
line number) so that the patch operation can continue.

Issue originally found by Neels Hofmeyr in the regress suite of the diff
implementation for got, where the tests assume that applying a diff with
`patch' and then again with `patch -R' yields back the original file.

Obtained from:	OpenBSD (CVS patch.c,v 1.71)
This commit is contained in:
Pedro F. Giffuni 2023-12-03 12:33:03 -05:00
parent 970d73856b
commit 7e8afbb6d6
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -717,6 +717,8 @@ locate_hunk(LINENUM fuzz)
|| diff_type == UNI_DIFF)) {
say("Empty context always matches.\n");
}
if (first_guess == 0) /* empty file */
return 1;
return (first_guess);
}
if (max_neg_offset >= first_guess) /* do not try lines < 0 */