read-cache: fix index corruption with index v4

ce012deb98 ("read-cache: avoid allocating every ondisk entry when writing", 2017-08-21) changed the way cache entries are written to the index file. While previously it wrote the name to an struct that was allocated using xcalloc(), it now uses ce_write() directly. Previously ce_namelen - common bytes were written to the cache entry, which would automatically make it nul terminated, as it was allocated using calloc. Now we are writing ce_namelen - common + 1 bytes directly from the ce->name to the index. If CE_STRIP_NAME however gets set in the split index case ce->ce_namelen is set to 0 without changing the actual ce->name buffer. When index-v4, this results in the first character of ce->name being written out instead of just a terminating nul charcter. As index-v4 requires the terminating nul character as terminator of the name when reading it back, this results in a corrupted index. Fix that by only writing ce_namelen - common bytes directly from ce->name to the index, and adding the nul terminator in an extra call to ce_write. This bug was turned up by setting TEST_GIT_INDEX_VERSION = 4 in config.mak and running the test suite (t1700 specifically broke). Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thomas Gummerer committed Sep 7, 2017 at 20:24 UTC 0b90b881e0c1de110c724fe63df6d2c3c9680d6a
1 file changed +3 -1
read-cache.c
+3 -1
@@ -2103,7 +2103,9 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
2103 if (!result)
2104 result = ce_write(c, fd, to_remove_vi, prefix_size);
2105 if (!result)
2106 - result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common + 1);
2106 + result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
2107 + if (!result)
2108 + result = ce_write(c, fd, padding, 1);
2109
2110 strbuf_splice(previous_name, common, to_remove,
2111 ce->name + common, ce_namelen(ce) - common);