From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 04:17:45 +0000 (-0700)
Subject: fsck-objects: do not segfault on missing tree in cache-tree
X-Git-Tag: v1.4.0-rc1~45^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d60bbefdc2a42614069024b0a38db8c2de33967;p=git.git

fsck-objects: do not segfault on missing tree in cache-tree

Even if trees are missing in cache-tree, we should continue and
check the rest of the object database.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/fsck-objects.c b/fsck-objects.c
index 98421aab3..1922b6d84 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -446,6 +446,11 @@ 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)