From 3687be20bc4abf0c0c197d617afaa3a717b1ab9c Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 3 Aug 2010 22:06:21 +0200 Subject: ui-refs.c: avoid segfault on unparsed ref objects When a ref refers to something other then a commit or tag object, cgit could segfault when trying to display the tag info. Noticed-by: Eugene Sajine Signed-off-by: Lars Hjemli diff --git a/ui-refs.c b/ui-refs.c index d3b4f6e..6571cc4 100644 --- a/ui-refs.c +++ b/ui-refs.c @@ -42,23 +42,25 @@ static int cmp_branch_age(const void *a, const void *b) return cmp_age(r1->commit->committer_date, r2->commit->committer_date); } +static int get_ref_age(struct refinfo *ref) +{ + if (!ref->object) + return 0; + switch (ref->object->type) { + case OBJ_TAG: + return ref->tag ? ref->tag->tagger_date : 0; + case OBJ_COMMIT: + return ref->commit ? ref->commit->committer_date : 0; + } + return 0; +} + static int cmp_tag_age(const void *a, const void *b) { struct refinfo *r1 = *(struct refinfo **)a; struct refinfo *r2 = *(struct refinfo **)b; - int r1date, r2date; - - if (r1->object->type != OBJ_COMMIT) - r1date = r1->tag->tagger_date; - else - r1date = r1->commit->committer_date; - - if (r2->object->type != OBJ_COMMIT) - r2date = r2->tag->tagger_date; - else - r2date = r2->commit->committer_date; - return cmp_age(r1date, r2date); + return cmp_age(get_ref_age(r1), get_ref_age(r2)); } static int print_branch(struct refinfo *ref) -- cgit v0.10.1 From 15c64c5e474bfaa7fd68c588a13d20deefe1c59d Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 3 Aug 2010 22:50:02 +0200 Subject: CGIT 0.8.3.3 Signed-off-by: Lars Hjemli diff --git a/Makefile b/Makefile index 1dc44d5..5162020 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CGIT_VERSION = v0.8.3.2 +CGIT_VERSION = v0.8.3.3 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) -- cgit v0.10.1