summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2009-02-10 21:36:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-10 23:30:59 (GMT)
commit3d20c636af05c44a6ff4df9309c2bca108ee149b (patch)
tree97e2732bcb3039de582f9118077a43a1dc6e0472 /sha1_file.c
parentab2fdb3b62589477bde0cd0af8239bee510c3488 (diff)
downloadgit-3d20c636af05c44a6ff4df9309c2bca108ee149b.zip
git-3d20c636af05c44a6ff4df9309c2bca108ee149b.tar.gz
git-3d20c636af05c44a6ff4df9309c2bca108ee149b.tar.bz2
Clear the delta base cache during fast-import checkpoint
Otherwise we may reuse the same memory address for a totally different "struct packed_git", and a previously cached object from the prior occupant might be returned when trying to unpack an object from the new pack. Found-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 0cfea9e..cbcae24 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1630,6 +1630,13 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
}
}
+void clear_delta_base_cache(void)
+{
+ unsigned long p;
+ for (p = 0; p < MAX_DELTA_CACHE; p++)
+ release_delta_base_cache(&delta_base_cache[p]);
+}
+
static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
void *base, unsigned long base_size, enum object_type type)
{