summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-03 15:18:04 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-03 15:18:04 -0700
commit7c2e8fc68469d374c8fd460a9342449642b4c8bc (patch)
tree8a141059e018d889d16daa1f0e295e8e04cb1e29 /sha1_file.c
parent1c937682c20970c83d17957ee0460d596eb1b009 (diff)
parent756a042600a3e234e7f1eae92c84d395c6833c6d (diff)
downloadgit-7c2e8fc68469d374c8fd460a9342449642b4c8bc.tar.gz
Merge branch 'tr/unpack-entry-use-after-free-fix'
* tr/unpack-entry-use-after-free-fix: unpack_entry: avoid freeing objects in base cache
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 64228a26d0..67e815b2db 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2128,7 +2128,6 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
error("failed to unpack compressed delta "
"at offset %"PRIuMAX" from %s",
(uintmax_t)curpos, p->pack_name);
- free(base);
data = NULL;
continue;
}