]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-apply: bad patch fragments are fatal
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 May 2005 19:31:59 +0000 (12:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 May 2005 19:31:59 +0000 (12:31 -0700)
Don't just stop at them and look for the next header. Die,
die, die!

apply.c

diff --git a/apply.c b/apply.c
index 85d7965daa09d01f05a65f5bdde8d889fd21744b..536b06829292485e36f1a8a8d83bed094702e49e 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -240,7 +240,7 @@ static int apply_single_patch(char *line, unsigned long size)
        while (size > 4 && !memcmp(line, "@@ -", 4)) {
                int len = apply_fragment(line, size);
                if (len <= 0)
-                       break;
+                       die("corrupt patch");
 
 printf("applying fragment:\n%.*s\n\n", len, line);