From: John Keeping <john@keeping.me.uk>
Date: Tue, 31 Mar 2015 01:22:11 +0000 (-0700)
Subject: streaming.c: fix a memleak
X-Git-Tag: v2.4.0-rc2~5^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ce4ad3e0eac33b4cae38ebd76c26ddba2468631

streaming.c: fix a memleak

When stream_blob_to_fd() opens an input stream with a filter, the
filter gets discarded upon calling close_istream() before the
function returns in the normal case.  However, when we fail to open
the stream, we failed to discard the filter.

By discarding the filter in the failure case, give a consistent
life-time rule of the filter to the callers; otherwise the callers
need to conditionally discard the filter themselves, and this
function does not give enough hint for the caller to do so
correctly.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/streaming.c b/streaming.c
index 7e7ee2be6f..c4d421d599 100644
--- a/streaming.c
+++ b/streaming.c
@@ -505,8 +505,11 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
 	int result = -1;
 
 	st = open_istream(sha1, &type, &sz, filter);
-	if (!st)
+	if (!st) {
+		if (filter)
+			free_stream_filter(filter);
 		return result;
+	}
 	if (type != OBJ_BLOB)
 		goto close_and_exit;
 	for (;;) {