Merge pull request #2301 from libgit2/cmn/pack-objects-memory

Keep the deflate buffer from ballooning up
This commit is contained in:
Vicent Marti 2014-04-27 03:57:53 -07:00
commit ec77105889
2 changed files with 2 additions and 1 deletions

View File

@ -406,6 +406,7 @@ static int write_one(
po->delta = NULL;
}
*status = WRITE_ONE_WRITTEN;
po->written = 1;
po->recursing = 0;

View File

@ -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;