summaryrefslogtreecommitdiffabout
path: root/ui-refs.c
authorLars Hjemli <hjemli@gmail.com>2010-08-03 20:06:21 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-08-03 20:06:21 (UTC)
commit3687be20bc4abf0c0c197d617afaa3a717b1ab9c (patch) (unidiff)
treec1f8f6f93006ffb583c1f0d84607934144caf89b /ui-refs.c
parent73ac0fb6f217addbcd7878828407392418c973de (diff)
downloadcgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.zip
cgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.tar.gz
cgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.tar.bz2
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 <euguess@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-refs.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-refs.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/ui-refs.c b/ui-refs.c
index d3b4f6e..6571cc4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -21,65 +21,67 @@ static int cmp_age(int age1, int age2)
21 return 0; 21 return 0;
22 22
23 if (age1 == 0) 23 if (age1 == 0)
24 return +1; 24 return +1;
25 25
26 return -1; 26 return -1;
27} 27}
28 28
29static int cmp_ref_name(const void *a, const void *b) 29static int cmp_ref_name(const void *a, const void *b)
30{ 30{
31 struct refinfo *r1 = *(struct refinfo **)a; 31 struct refinfo *r1 = *(struct refinfo **)a;
32 struct refinfo *r2 = *(struct refinfo **)b; 32 struct refinfo *r2 = *(struct refinfo **)b;
33 33
34 return strcmp(r1->refname, r2->refname); 34 return strcmp(r1->refname, r2->refname);
35} 35}
36 36
37static int cmp_branch_age(const void *a, const void *b) 37static int cmp_branch_age(const void *a, const void *b)
38{ 38{
39 struct refinfo *r1 = *(struct refinfo **)a; 39 struct refinfo *r1 = *(struct refinfo **)a;
40 struct refinfo *r2 = *(struct refinfo **)b; 40 struct refinfo *r2 = *(struct refinfo **)b;
41 41
42 return cmp_age(r1->commit->committer_date, r2->commit->committer_date); 42 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
43} 43}
44 44
45static int get_ref_age(struct refinfo *ref)
46{
47 if (!ref->object)
48 return 0;
49 switch (ref->object->type) {
50 case OBJ_TAG:
51 return ref->tag ? ref->tag->tagger_date : 0;
52 case OBJ_COMMIT:
53 return ref->commit ? ref->commit->committer_date : 0;
54 }
55 return 0;
56}
57
45static int cmp_tag_age(const void *a, const void *b) 58static int cmp_tag_age(const void *a, const void *b)
46{ 59{
47 struct refinfo *r1 = *(struct refinfo **)a; 60 struct refinfo *r1 = *(struct refinfo **)a;
48 struct refinfo *r2 = *(struct refinfo **)b; 61 struct refinfo *r2 = *(struct refinfo **)b;
49 int r1date, r2date;
50
51 if (r1->object->type != OBJ_COMMIT)
52 r1date = r1->tag->tagger_date;
53 else
54 r1date = r1->commit->committer_date;
55
56 if (r2->object->type != OBJ_COMMIT)
57 r2date = r2->tag->tagger_date;
58 else
59 r2date = r2->commit->committer_date;
60 62
61 return cmp_age(r1date, r2date); 63 return cmp_age(get_ref_age(r1), get_ref_age(r2));
62} 64}
63 65
64static int print_branch(struct refinfo *ref) 66static int print_branch(struct refinfo *ref)
65{ 67{
66 struct commitinfo *info = ref->commit; 68 struct commitinfo *info = ref->commit;
67 char *name = (char *)ref->refname; 69 char *name = (char *)ref->refname;
68 70
69 if (!info) 71 if (!info)
70 return 1; 72 return 1;
71 html("<tr><td>"); 73 html("<tr><td>");
72 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, 74 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
73 ctx.qry.showmsg); 75 ctx.qry.showmsg);
74 html("</td><td>"); 76 html("</td><td>");
75 77
76 if (ref->object->type == OBJ_COMMIT) { 78 if (ref->object->type == OBJ_COMMIT) {
77 cgit_commit_link(info->subject, NULL, NULL, name, NULL); 79 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
78 html("</td><td>"); 80 html("</td><td>");
79 html_txt(info->author); 81 html_txt(info->author);
80 html("</td><td colspan='2'>"); 82 html("</td><td colspan='2'>");
81 cgit_print_age(info->commit->date, -1, NULL); 83 cgit_print_age(info->commit->date, -1, NULL);
82 } else { 84 } else {
83 html("</td><td></td><td>"); 85 html("</td><td></td><td>");
84 cgit_object_link(ref->object); 86 cgit_object_link(ref->object);
85 } 87 }