Code

builtin-apply: fix conversion error in strbuf series
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Oct 2007 00:42:52 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Oct 2007 00:42:52 +0000 (17:42 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c

index 047a60d1a43a24c3e7d086cf9f87cb36835e8495..05c6bc3592e98958a4629ab856be33adc9ace33c 100644 (file)
@@ -2651,7 +2651,7 @@ static int apply_patch(int fd, const char *filename, int inaccurate_eof)
 
                patch = xcalloc(1, sizeof(*patch));
                patch->inaccurate_eof = inaccurate_eof;
-               nr = parse_chunk(buf.buf + offset, buf.len, patch);
+               nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
                if (nr < 0)
                        break;
                if (apply_in_reverse)