@matheusbsbs / matheus-bagliano / commits / 61eea521fe
Fork 0

fsmonitor: do not compare bitmap size with size of split index

3444ec2e ("fsmonitor: don't fill bitmap with entries to be removed", 2019-10-11) added a handful of sanity checks that make sure that a bit position in fsmonitor bitmap does not go beyond the end of the index. As each bit in the bitmap corresponds to a path in the index, this is the right check most of the time. Except for the case when we are in the split-index mode and looking at a delta index that is to be overlayed on the base index but before the base index has actually been merged in, namely in read_ and write_fsmonitor_extension(). In these codepaths, the entries in the split/delta index is typically a small subset of the entire set of paths (otherwise why would we be using split-index?), so the bitmap used by the fsmonitor is almost always larger than the number of entries in the partial index, and the incorrect comparison would trigger the BUG(). Reported-by: Utsav Shah <ukshah2@illinois.edu> Helped-by: Kevin Willford <Kevin.Willford@microsoft.com> Helped-by: William Baker <William.Baker@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Nov 13, 2019 at 10:30 UTC 61eea521fef11c6878a4157bcc0fca6e981a58b2
1 file changed +4 -2
fsmonitor.c
+4 -2
@@ -55,7 +55,8 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
55 }
56 istate->fsmonitor_dirty = fsmonitor_dirty;
57
58 - if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
58 + if (!istate->split_index &&
59 + istate->fsmonitor_dirty->bit_size > istate->cache_nr)
60 BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
61 (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
62
@@ -83,7 +84,8 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
84 uint32_t ewah_size = 0;
85 int fixup = 0;
86
86 - if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
87 + if (!istate->split_index &&
88 + istate->fsmonitor_dirty->bit_size > istate->cache_nr)
89 BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
90 (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
91