diff options
| -rw-r--r-- | fsck-objects.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fsck-objects.c b/fsck-objects.c index 0d8a8ebb46..81f00db90b 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -290,7 +290,7 @@ static int fsck_sha1(unsigned char *sha1) { struct object *obj = parse_object(sha1); if (!obj) - return error("%s: object not found", sha1_to_hex(sha1)); + return error("%s: object corrupt or missing", sha1_to_hex(sha1)); if (obj->flags & SEEN) return 0; obj->flags |= SEEN; diff --git a/git-compat-util.h b/git-compat-util.h index f8d46d587b..8781e8e22d 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -202,6 +202,8 @@ static inline void *xmmap(void *start, size_t length, { void *ret = mmap(start, length, prot, flags, fd, offset); if (ret == MAP_FAILED) { + if (!length) + return NULL; release_pack_memory(length); ret = mmap(start, length, prot, flags, fd, offset); if (ret == MAP_FAILED) |