From ee639140c9d3d7d0c8821e6b7d36c75ae578b326 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Wed, 3 Aug 2005 16:11:00 +0400 Subject: [PATCH] [PATCH] Plug memory leaks in git-unpack-objects - Call inflateEnd to release zlib state after use. - After resolving delta, free base object data. Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano --- unpack-objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unpack-objects.c b/unpack-objects.c index 19874d004..7e7be5cbd 100644 --- a/unpack-objects.c +++ b/unpack-objects.c @@ -75,6 +75,7 @@ static void *get_data(unsigned long size) stream.next_in = fill(1); stream.avail_in = len; } + inflateEnd(&stream); return buf; } @@ -167,6 +168,7 @@ static int unpack_delta_entry(unsigned long delta_size) unsigned long base_size; char type[20]; unsigned char base_sha1[20]; + int result; memcpy(base_sha1, fill(20), 20); use(20); @@ -184,7 +186,9 @@ static int unpack_delta_entry(unsigned long delta_size) base = read_sha1_file(base_sha1, type, &base_size); if (!base) die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1)); - return resolve_delta(type, base, base_size, delta_data, delta_size); + result = resolve_delta(type, base, base_size, delta_data, delta_size); + free(base); + return result; } static void unpack_one(unsigned nr, unsigned total) -- 2.30.2