Skip to content

Commit 95dea6e

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6b6cab3 commit 95dea6e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

streaming.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ struct git_istream {
9494

9595
int close_istream(struct git_istream *st)
9696
{
97-
return st->vtbl->close(st);
97+
int r = st->vtbl->close(st);
98+
free(st);
99+
return r;
98100
}
99101

100102
ssize_t read_istream(struct git_istream *st, char *buf, size_t sz)

0 commit comments

Comments
 (0)