From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:24 +0000 (-0800)
Subject: Merge branch 'rs/strbuf-read-once-reset-length'
X-Git-Tag: v2.16.0-rc0~31
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/a13e45f1e7e6fc02d4e10e0589578a77e84f3ffb?hp=1f9ce78df08120f6a67107ccbc6b1c4658cd1808

Merge branch 'rs/strbuf-read-once-reset-length'

Leakfix.

* rs/strbuf-read-once-reset-length:
strbuf: release memory on read error in strbuf_read_once()
---

diff --git a/strbuf.c b/strbuf.c
index 323c49ceb3..ac5a7ab62d 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -386,12 +386,15 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
 
 ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
 {
+	size_t oldalloc = sb->alloc;
 	ssize_t cnt;
 
 	strbuf_grow(sb, hint ? hint : 8192);
 	cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
 	if (cnt > 0)
 		strbuf_setlen(sb, sb->len + cnt);
+	else if (oldalloc == 0)
+		strbuf_release(sb);
 	return cnt;
 }