Merge branch 'mm/empty-loose-error-message' into maint

* mm/empty-loose-error-message: fsck: give accurate error message on empty loose object files
git-mirror · Feb 16, 2012 · c6a4e3f · c6a4e3f
2 parents f342afa + 33e42de
commit c6a4e3f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sha1_file.c b/sha1_file.c
@@ -1202,6 +1202,11 @@ 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);