From 6e1c6c103c522d01829f3a63992a023ff031e851 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 19 Oct 2005 22:48:16 -0700 Subject: [PATCH] Make sure we barf on ref^{type} failure. Martin Langhoff noticed that ref^0 barfed correctly when we did not have the commit in a broken repository, but ref^{commit} didn't. Signed-off-by: Junio C Hamano --- sha1_name.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sha1_name.c b/sha1_name.c index 75c688ec..cc320d3d 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -323,6 +323,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) return -1; if (!type_string) { o = deref_tag(o); + if (!o || (!o->parsed && !parse_object(o->sha1))) + return -1; memcpy(sha1, o->sha1, 20); } else { @@ -332,7 +334,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) */ while (1) { - if (!o) + if (!o || (!o->parsed && !parse_object(o->sha1))) return -1; if (o->type == type_string) { memcpy(sha1, o->sha1, 20); -- 2.11.0