@matheusbsbs / matheus-bagliano / commits / c150462824
Fork 0

git-apply: safety fixes

This was triggered by me testing the "@@" numbering shorthand by GNU patch, which not only showed that git-apply thought it meant the number was duplicated (when it means that the second number is 1), but my tests showed than when git-apply mis-understood the number, it would then not raise an alarm about it if the patch ended early. Now, this doesn't actually _matter_, since with a three-line context, the only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in which case git-apply got it right), but the fact that git-apply would also silently accept truncated patches was a missed opportunity for additional sanity-checking. So make git-apply refuse to look at a patch fragment that ends early. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Mar 25, 2006 at 13:28 UTC c150462824008957f568ca7aa05a65b35d860eb9
1 file changed +3 -1
apply.c
+3 -1
@@ -693,7 +693,7 @@ static int parse_range(const char *line, int len, int offset, const char *expect
693 line += digits;
694 len -= digits;
695
696 - *p2 = *p1;
696 + *p2 = 1;
697 if (*line == ',') {
698 digits = parse_num(line+1, p2);
699 if (!digits)
@@ -901,6 +901,8 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
901 break;
902 }
903 }
904 + if (oldlines || newlines)
905 + return -1;
906 /* If a fragment ends with an incomplete line, we failed to include
907 * it in the above loop because we hit oldlines == newlines == 0
908 * before seeing it.