summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-25 02:01:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 02:01:50 (GMT)
commit76026200eee9fea016c2d87f472bb13cb15f47b2 (patch)
tree0c1f5eb37f018f48f355daf27fcbfb7c2a755858 /object.c
parenta21f0f0a22c513130f1268e3296dd52d47d2f0e0 (diff)
parent0b1f113075aafb0c91a406d984d0152e55c981da (diff)
downloadgit-76026200eee9fea016c2d87f472bb13cb15f47b2.zip
git-76026200eee9fea016c2d87f472bb13cb15f47b2.tar.gz
git-76026200eee9fea016c2d87f472bb13cb15f47b2.tar.bz2
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: fix memory leak in parse_object when check_sha1_signature fails name-rev: tolerate clock skew in committer dates
Diffstat (limited to 'object.c')
-rw-r--r--object.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/object.c b/object.c
index 37d1363..cfc4969 100644
--- a/object.c
+++ b/object.c
@@ -176,6 +176,7 @@ struct object *parse_object(const unsigned char *sha1)
if (buffer) {
struct object *obj;
if (check_sha1_signature(sha1, buffer, size, typename(type)) < 0) {
+ free(buffer);
error("sha1 mismatch %s\n", sha1_to_hex(sha1));
return NULL;
}