2 files changed, 15 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 8b426fe..3e5a38d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
-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_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.7.0
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
 # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
 # implementation (slower).
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
diff --git a/ui-refs.c b/ui-refs.c
index 94ff6be..caddfbc 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -29,49 +29,51 @@ static int cmp_age(int age1, int age2)
 static int cmp_ref_name(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
 
         return strcmp(r1->refname, r2->refname);
 }
 
 static int cmp_branch_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)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)
 {
         struct commitinfo *info = ref->commit;
         char *name = (char *)ref->refname;
 
         if (!info)
                 return 1;
         html("<tr><td>");
         cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
                       ctx.qry.showmsg);
         html("</td><td>");
 
         if (ref->object->type == OBJ_COMMIT) {
                 cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);