diff options
| author | Jeff King <peff@peff.net> | 2011-07-22 11:00:03 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:30:49 -0700 |
| commit | 95dea6eb507109f64ab80f7fa2f73c39a0d14e7c (patch) | |
| tree | 0945227c46afac0e556955396478d6ab00bd4844 | |
| parent | 6b6cab3f9af2ab7010592e50bb343b990a6a7666 (diff) | |
| download | git-95dea6eb507109f64ab80f7fa2f73c39a0d14e7c.tar.gz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | streaming.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/streaming.c b/streaming.c index 91414f4592..d8c16d28f6 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) |