diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-22 09:56:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 10:26:01 -0700 |
| commit | 8b64647dd9009f52e23e7fdb443b7b8f9502278a (patch) | |
| tree | b5bf78e0adb24a14571d4749b79cbad40da3aff4 /apply.c | |
| parent | f0b32737ad5a35cc047db47353a75faccfe5939e (diff) | |
| download | git-8b64647dd9009f52e23e7fdb443b7b8f9502278a.tar.gz | |
[PATCH] apply.c: handle incomplete lines correctly.
The parsing code had a bug that failed to recognize an
incomplete line at the end of a fragment, and the fragment
application code had a comparison bug to recognize such. Fix
them to handle incomplete lines correctly.
Add a test script for patches with various combinations of
complete and incomplete lines to make sure the fix works.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -679,6 +679,13 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s break; } } + /* If a fragment ends with an incomplete line, we failed to include + * it in the above loop because we hit oldlines == newlines == 0 + * before seeing it. + */ + if (12 < size && !memcmp(line, "\\ No newline", 12)) + offset += linelen(line, size); + patch->lines_added += added; patch->lines_deleted += deleted; return offset; @@ -900,7 +907,7 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag) * last one (which is the newline, of course). */ plen = len-1; - if (len > size && patch[len] == '\\') + if (len < size && patch[len] == '\\') plen--; switch (*patch) { case ' ': |