commit cd31e9115f6721c23df6212f4a8f3fda3133d189
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jul 23 15:49:17 2018 UTC

fix a leak and use recallocarray in read_object_header()

commit - 17d745b8721ea2b811c9876638c588496f56d269
commit + cd31e9115f6721c23df6212f4a8f3fda3133d189
blob - b08d9411dd2250a534c4923a21e284a18649cf59
blob + b039c61e57352c8c98d18add20a62a7efa415a08
--- lib/object.c
+++ lib/object.c
@@ -191,36 +191,41 @@ read_object_header(struct got_object **obj, int fd)
 	char *buf;
 	const size_t zbsize = 64;
 	size_t outlen, totlen;
-	int i;
+	int nbuf = 1;
 
 	buf = malloc(zbsize);
 	if (buf == NULL)
 		return got_error_from_errno();
 
-	err = got_inflate_init(&zb, NULL, zbsize);
+	err = got_inflate_init(&zb, buf, zbsize);
 	if (err)
 		return err;
 
-	i = 0;
 	totlen = 0;
 	do {
 		err = got_inflate_read_fd(&zb, fd, &outlen);
 		if (err)
 			goto done;
+		if (outlen == 0)
+			break;
+		totlen += outlen;
 		if (strchr(zb.outbuf, '\0') == NULL) {
-			buf = reallocarray(buf, 2 + i, zbsize);
-			if (buf == NULL) {
+			char *newbuf;
+			nbuf++;
+			newbuf = recallocarray(buf, nbuf - 1, nbuf, zbsize);
+			if (newbuf == NULL) {
 				err = got_error_from_errno();
 				goto done;
 			}
+			buf = newbuf;
+			zb.outbuf = newbuf + totlen;
+			zb.outlen = (nbuf * zbsize) - totlen;
 		}
-		memcpy(buf + totlen, zb.outbuf, outlen);
-		totlen += outlen;
-		i++;
 	} while (strchr(zb.outbuf, '\0') == NULL);
 
 	err = parse_object_header(obj, buf, totlen);
 done:
+	free(buf);
 	got_inflate_end(&zb);
 	return err;
 }