summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2015-03-30 18:22:11 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-31 12:14:42 -0700
commit9ce4ad3e0eac33b4cae38ebd76c26ddba2468631 (patch)
tree2cdf4771051cd839933373ac9088842d8f4bd1ea
parent47a02ff2ca821c52268197dd5fa46cd60a2e94bc (diff)
downloadgit-9ce4ad3e0eac33b4cae38ebd76c26ddba2468631.tar.gz
streaming.c: fix a memleaksb/plug-streaming-leak
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>
-rw-r--r--streaming.c5
1 files changed, 4 insertions, 1 deletions
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 (;;) {