Merge branch 'jk/apply-binary-hunk-parsing-fix'

[thirdparty/git.git] / apply.c

diff --git a/apply.c b/apply.c
index 44bc31d6eb5b42d4077eff458246cde376cb6785..4ed4b271691a4cf5db0f6c1df73fae1cb891741f 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -1917,6 +1917,7 @@ static struct fragment *parse_binary_hunk(struct apply_state *state,
 
        state->linenr++;
        buffer += llen;
+       size -= llen;
        while (1) {
                int byte_length, max_byte_length, newsize;
                llen = linelen(buffer, size);