diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:40:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:40:07 -0700 |
| commit | 37b92a9a2eb1d49409a0b4d16404a3ac265ca723 (patch) | |
| tree | c8f66838a633d8a9e988ad6fa0b4acc26babb082 /builtin | |
| parent | Merge branch 'jk/maint-commit-amend-only-no-paths' (diff) | |
| parent | index-pack: loop while inflating objects in unpack_data (diff) | |
| download | tgif-37b92a9a2eb1d49409a0b4d16404a3ac265ca723.tar.xz | |
Merge branch 'jk/index-pack-streaming-fix'
The streaming index-pack introduced in 1.7.11 had a data corruption
bug, and this should fix it.
* jk/index-pack-streaming-fix:
index-pack: loop while inflating objects in unpack_data
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 5a0372ab08..953dd3004e 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -524,7 +524,6 @@ static void *unpack_data(struct object_entry *obj, stream.avail_out = consume ? 64*1024 : obj->size; do { - unsigned char *last_out = stream.next_out; ssize_t n = (len < 64*1024) ? len : 64*1024; n = pread(pack_fd, inbuf, n, from); if (n < 0) @@ -538,15 +537,19 @@ static void *unpack_data(struct object_entry *obj, len -= n; stream.next_in = inbuf; stream.avail_in = n; - status = git_inflate(&stream, 0); - if (consume) { - if (consume(last_out, stream.next_out - last_out, cb_data)) { - free(inbuf); - free(data); - return NULL; - } - stream.next_out = data; - stream.avail_out = 64*1024; + if (!consume) + status = git_inflate(&stream, 0); + else { + do { + status = git_inflate(&stream, 0); + if (consume(data, stream.next_out - data, cb_data)) { + free(inbuf); + free(data); + return NULL; + } + stream.next_out = data; + stream.avail_out = 64*1024; + } while (status == Z_OK && stream.avail_in); } } while (len && status == Z_OK && !stream.avail_in); |