From: Martin Koegler Date: Wed, 2 Jan 2008 07:39:21 +0000 (+0100) Subject: receive-pack: check object type of sha1 before using them as commits X-Git-Tag: v1.5.4-rc3~62 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eab827072d1e197eb6ccb6f75e7fe86143735f1e;p=git.git receive-pack: check object type of sha1 before using them as commits Signed-off-by: Martin Koegler Signed-off-by: Junio C Hamano --- diff --git a/receive-pack.c b/receive-pack.c index fba4cf823..d0a563df6 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -178,11 +178,21 @@ static const char *update(struct command *cmd) if (deny_non_fast_forwards && !is_null_sha1(new_sha1) && !is_null_sha1(old_sha1) && !prefixcmp(name, "refs/heads/")) { + struct object *old_object, *new_object; struct commit *old_commit, *new_commit; struct commit_list *bases, *ent; - old_commit = (struct commit *)parse_object(old_sha1); - new_commit = (struct commit *)parse_object(new_sha1); + old_object = parse_object(old_sha1); + new_object = parse_object(new_sha1); + + if (!old_object || !new_object || + old_object->type != OBJ_COMMIT || + new_object->type != OBJ_COMMIT) { + error("bad sha1 objects for %s", name); + return "bad ref"; + } + old_commit = (struct commit *)old_object; + new_commit = (struct commit *)new_object; bases = get_merge_bases(old_commit, new_commit, 1); for (ent = bases; ent; ent = ent->next) if (!hashcmp(old_sha1, ent->item->object.sha1))