From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Aug 2011 22:00:29 +0000 (-0700)
Subject: Merge branch 'jc/streaming-filter'
X-Git-Tag: v1.7.7-rc0~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b04f826bf6e1b55e5bffdef5aedc83c202569f60?ds=inline;hp=-c

Merge branch 'jc/streaming-filter'

* jc/streaming-filter:
streaming: free git_istream upon closing
---

b04f826bf6e1b55e5bffdef5aedc83c202569f60
diff --combined streaming.c
index 25c9a209bb,d8c16d28f6..71072e1b1d
--- a/streaming.c
+++ b/streaming.c
@@@ -66,7 -66,7 +66,7 @@@ struct filtered_istream 
  struct git_istream {
  	const struct stream_vtbl *vtbl;
  	unsigned long size; /* inflated size of full object */
 -	z_stream z;
 +	git_zstream z;
  	enum { z_unused, z_used, z_done, z_error } z_state;
  
  	union {
@@@ -94,7 -94,9 +94,9 @@@
  
  int close_istream(struct git_istream *st)
  {
- 	return st->vtbl->close(st);
+ 	int r = st->vtbl->close(st);
+ 	free(st);
+ 	return r;
  }
  
  ssize_t read_istream(struct git_istream *st, char *buf, size_t sz)