Commit ec77105889105204f0efd723200aa74971e8edd3

Vicent Marti 2014-04-27T03:57:53

Merge pull request #2301 from libgit2/cmn/pack-objects-memory Keep the deflate buffer from ballooning up

diff --git a/src/pack-objects.c b/src/pack-objects.c
index 7e5f667..ace8afd 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 85fa2e0..e75fb26 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;