X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-objects.c;h=1922b6d84c51588b22553141f608c9a07182560b;hb=3f69d405d749742945afd462bff6541604ecd420;hp=cc09143a92a64a0d7e14fb7195cd39c05bb0b49f;hpb=53dc3f3e8069283924fcb7f1d538e2d1b03ec3bb;p=git.git

diff --git a/fsck-objects.c b/fsck-objects.c
index cc09143a..1922b6d8 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -446,6 +446,13 @@ static int fsck_cache_tree(struct cache_tree *it)
 
 	if (0 <= it->entry_count) {
 		struct object *obj = parse_object(it->sha1);
+		if (!obj) {
+			error("%s: invalid sha1 pointer in cache-tree",
+			      sha1_to_hex(it->sha1));
+			return 1;
+		}
+		mark_reachable(obj, REACHABLE);
+		obj->used = 1;
 		if (obj->type != tree_type)
 			err |= objerror(obj, "non-tree in cache-tree");
 	}