diff options
| author | Vicent Marti <vicent@github.com> | 2014-04-27 03:57:53 -0700 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-04-27 03:57:53 -0700 |
| commit | ec77105889105204f0efd723200aa74971e8edd3 (patch) | |
| tree | e97e65624ca8950ec2bf257ef0f0ad77639b803f | |
| parent | 4f9d54146d569fffb679386fd3057e571afacd1f (diff) | |
| parent | 38d338b2b85f280fe54057375fc3ccd6d2877e26 (diff) | |
| download | libgit2-ec77105889105204f0efd723200aa74971e8edd3.tar.gz | |
Merge pull request #2301 from libgit2/cmn/pack-objects-memory
Keep the deflate buffer from ballooning up
| -rw-r--r-- | src/pack-objects.c | 1 | ||||
| -rw-r--r-- | src/zstream.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/pack-objects.c b/src/pack-objects.c index 7e5f667f4..ace8afd17 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -406,6 +406,7 @@ static int write_one( po->delta = NULL; } + *status = WRITE_ONE_WRITTEN; po->written = 1; po->recursing = 0; diff --git a/src/zstream.c b/src/zstream.c index 85fa2e0e6..e75fb265e 100644 --- a/src/zstream.c +++ b/src/zstream.c @@ -134,7 +134,7 @@ int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len) while (!git_zstream_done(&zs)) { size_t step = git_zstream_suggest_output_len(&zs), written; - if ((error = git_buf_grow(out, out->asize + step)) < 0) + if ((error = git_buf_grow(out, out->size + step)) < 0) goto done; written = out->asize - out->size; |