index-pack.c: correctly initialize appended objects
When index-pack completes a thin pack it appends objects to the pack. Since the commit 92392b4(index-pack: Honor core.deltaBaseCacheLimit when resolving deltas) such an object can be pruned in case of memory pressure, and will be read back again by get_data_from_pack(). For this to work, the fields in object_entry structure need to be initialized properly. Noticed by Pierre Habouzit. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Björn Steinbrink committed
Jul 24, 2008 at 18:32 UTC
72de2883bd7d4ceda05f107826c7607c594de965
1 file changed
+4
index-pack.c
+4
@@ -698,6 +698,10 @@ static struct object_entry *append_obj_to_pack(
698
write_or_die(output_fd, header, n);
699
obj[0].idx.crc32 = crc32(0, Z_NULL, 0);
700
obj[0].idx.crc32 = crc32(obj[0].idx.crc32, header, n);
701
+ obj[0].size = size;
702
+ obj[0].hdr_size = n;
703
+ obj[0].type = type;
704
+ obj[0].real_type = type;
705
obj[1].idx.offset = obj[0].idx.offset + n;
706
obj[1].idx.offset += write_compressed(output_fd, buf, size, &obj[0].idx.crc32);
707
hashcpy(obj->idx.sha1, sha1);