From 33e42de0d21a8365496e904235bd32fd4659300d Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 6 Feb 2012 17:24:52 +0100 Subject: [PATCH] fsck: give accurate error message on empty loose object files Since 3ba7a065527a (A loose object is not corrupt if it cannot be read due to EMFILE), "git fsck" on a repository with an empty loose object file complains with the error message fatal: failed to read object : Invalid argument This comes from a failure of mmap on this empty file, which sets errno to EINVAL. Instead of calling xmmap on empty file, we display a clean error message ourselves, and return a NULL pointer. The new message is error: object file .git/objects/09/ is empty fatal: loose object (stored in .git/objects/09/) is corrupt The second line was already there before the regression in 3ba7a065527a, and the first is an additional message, that should help diagnosing the problem for the user. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- sha1_file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sha1_file.c b/sha1_file.c index 25f6965294..797b0634ce 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1070,6 +1070,11 @@ static void *map_sha1_file(const unsigned char *sha1, unsigned long *size) if (!fstat(fd, &st)) { *size = xsize_t(st.st_size); + if (!*size) { + /* mmap() is forbidden on empty files */ + error("object file %s is empty", sha1_file_name(sha1)); + return NULL; + } map = xmmap(NULL, *size, PROT_READ, MAP_PRIVATE, fd, 0); } close(fd);