• René Scharfe's avatar
    read-cache.c: fix index memory allocation · 8f41c07f
    René Scharfe authored
    estimate_cache_size() tries to guess how much memory is needed for the
    in-memory representation of an index file.  It does that by using the
    file size, the number of entries and the difference of the sizes of the
    on-disk and in-memory structs -- without having to check the length of
    the name of each entry, which varies for each entry, but their sums are
    the same no matter the representation.
    Except there can be a difference.  First of all, the size is really
    calculated by ce_size and ondisk_ce_size based on offsetof(..., name),
    not sizeof, which can be different.  And entries are padded with 1 to 8
    NULs at the end (after the variable name) to make their total length a
    multiple of eight.
    So in order to allocate enough memory to hold the index, change the
    delta calculation to be based on offsetof(..., name) and round up to
    the next multiple of eight.
    On a 32-bit Linux, this delta was used before:
    	sizeof(struct cache_entry)        == 72
    	sizeof(struct ondisk_cache_entry) == 64
    The actual difference for an entry with a filename length of one was,
    however (find the definitions are in cache.h):
    	offsetof(struct cache_entry, name)        == 72
    	offsetof(struct ondisk_cache_entry, name) == 62
    	ce_size        == (72 + 1 + 8) & ~7 == 80
    	ondisk_ce_size == (62 + 1 + 8) & ~7 == 64
    So eight bytes less had been allocated for such entries.  The new
    formula yields the correct delta:
    	(72 - 62 + 7) & ~7 == 16
    Reported-by: default avatarJohn Hsing <[email protected]>
    Signed-off-by: default avatarRene Scharfe <[email protected]>
    Signed-off-by: default avatarJunio C Hamano <[email protected]>
read-cache.c 45.4 KB