From: Jeff King Date: Fri, 22 Jul 2011 17:00:03 +0000 (-0600) Subject: streaming: free git_istream upon closing X-Git-Tag: v1.7.7-rc0~60^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=95dea6eb507109f64ab80f7fa2f73c39a0d14e7c;p=git.git streaming: free git_istream upon closing Kirill Smelkov noticed that post-1.7.6 "git checkout" started leaking tons of memory. The streaming_write_entry function properly calls close_istream(), but that function did not actually free() the allocated git_istream struct. The git_istream struct is totally opaque to calling code, and must be heap-allocated by open_istream. Therefore it's not appropriate for callers to have to free it. This patch makes close_istream() into "close and de-allocate all associated resources". We could add a new "free_istream" call, but there's not much point in letting callers inspect the istream after close. And this patch's semantics make us match fopen/fclose, which is well-known and understood. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/streaming.c b/streaming.c index 91414f459..d8c16d28f 100644 --- a/streaming.c +++ b/streaming.c @@ -94,7 +94,9 @@ struct git_istream { 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)