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>
Shawn O. Pearce committed
Feb 10, 2009 at 13:36 UTC
3d20c636af05c44a6ff4df9309c2bca108ee149b
3 files changed
+9
cache.h
+1
@@ -739,6 +739,7 @@ extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t
739
extern void close_pack_windows(struct packed_git *);
740
extern void unuse_pack(struct pack_window **);
741
extern void free_pack_by_name(const char *);
742
+extern void clear_delta_base_cache(void);
743
extern struct packed_git *add_packed_git(const char *, int, int);
744
extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t);
745
extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t);
fast-import.c
+1
@@ -943,6 +943,7 @@ static void end_packfile(void)
943
{
944
struct packed_git *old_p = pack_data, *new_p;
945
946
+ clear_delta_base_cache();
947
if (object_count) {
948
char *idx_name;
949
int i;
sha1_file.c
+7
@@ -1630,6 +1630,13 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
1630
}
1631
}
1632
1633
+void clear_delta_base_cache(void)
1634
+{
1635
+ unsigned long p;
1636
+ for (p = 0; p < MAX_DELTA_CACHE; p++)
1637
+ release_delta_base_cache(&delta_base_cache[p]);
1638
+}
1639
+
1640
static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
1641
void *base, unsigned long base_size, enum object_type type)
1642
{