summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-08-03 12:11:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-03 19:57:55 (GMT)
commitee639140c9d3d7d0c8821e6b7d36c75ae578b326 (patch)
tree854f18fff3074980176d4383fbea3f926a5d37fe
parent40b64d47c3dd071c84445dece4003bb52a194339 (diff)
downloadgit-ee639140c9d3d7d0c8821e6b7d36c75ae578b326.zip
git-ee639140c9d3d7d0c8821e6b7d36c75ae578b326.tar.gz
git-ee639140c9d3d7d0c8821e6b7d36c75ae578b326.tar.bz2
[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 <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--unpack-objects.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/unpack-objects.c b/unpack-objects.c
index 19874d0..7e7be5c 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)