summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2008-01-02 07:39:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-02 10:28:54 (GMT)
commiteab827072d1e197eb6ccb6f75e7fe86143735f1e (patch)
tree260521fe7b1041c98f2de9ca05feea555422a3f1 /receive-pack.c
parent99a6a97b1bf866d7050e8afb137b4b29507f0caa (diff)
downloadgit-eab827072d1e197eb6ccb6f75e7fe86143735f1e.zip
git-eab827072d1e197eb6ccb6f75e7fe86143735f1e.tar.gz
git-eab827072d1e197eb6ccb6f75e7fe86143735f1e.tar.bz2
receive-pack: check object type of sha1 before using them as commits
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'receive-pack.c')
-rw-r--r--receive-pack.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/receive-pack.c b/receive-pack.c
index fba4cf8..d0a563d 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))