author | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 20:06:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 20:06:21 (UTC) |
commit | 3687be20bc4abf0c0c197d617afaa3a717b1ab9c (patch) (unidiff) | |
tree | c1f8f6f93006ffb583c1f0d84607934144caf89b | |
parent | 73ac0fb6f217addbcd7878828407392418c973de (diff) | |
download | cgit-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>
-rw-r--r-- | ui-refs.c | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -1,109 +1,111 @@ | |||
1 | /* ui-refs.c: browse symbolic refs | 1 | /* ui-refs.c: browse symbolic refs |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | static int header; | 13 | static int header; |
14 | 14 | ||
15 | static int cmp_age(int age1, int age2) | 15 | static int cmp_age(int age1, int age2) |
16 | { | 16 | { |
17 | if (age1 != 0 && age2 != 0) | 17 | if (age1 != 0 && age2 != 0) |
18 | return age2 - age1; | 18 | return age2 - age1; |
19 | 19 | ||
20 | if (age1 == 0 && age2 == 0) | 20 | if (age1 == 0 && age2 == 0) |
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 | ||
29 | static int cmp_ref_name(const void *a, const void *b) | 29 | static 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 | ||
37 | static int cmp_branch_age(const void *a, const void *b) | 37 | static 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 | ||
45 | static 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 | |||
45 | static int cmp_tag_age(const void *a, const void *b) | 58 | static 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 | ||
64 | static int print_branch(struct refinfo *ref) | 66 | static 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 | } |
86 | html("</td></tr>\n"); | 88 | html("</td></tr>\n"); |
87 | return 0; | 89 | return 0; |
88 | } | 90 | } |
89 | 91 | ||
90 | static void print_tag_header() | 92 | static void print_tag_header() |
91 | { | 93 | { |
92 | html("<tr class='nohover'><th class='left'>Tag</th>" | 94 | html("<tr class='nohover'><th class='left'>Tag</th>" |
93 | "<th class='left'>Download</th>" | 95 | "<th class='left'>Download</th>" |
94 | "<th class='left'>Author</th>" | 96 | "<th class='left'>Author</th>" |
95 | "<th class='left' colspan='2'>Age</th></tr>\n"); | 97 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
96 | header = 1; | 98 | header = 1; |
97 | } | 99 | } |
98 | 100 | ||
99 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) | 101 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
100 | { | 102 | { |
101 | const struct cgit_snapshot_format* f; | 103 | const struct cgit_snapshot_format* f; |
102 | char *filename; | 104 | char *filename; |
103 | const char *basename; | 105 | const char *basename; |
104 | 106 | ||
105 | if (!ref || strlen(ref) < 2) | 107 | if (!ref || strlen(ref) < 2) |
106 | return; | 108 | return; |
107 | 109 | ||
108 | basename = cgit_repobasename(repo->url); | 110 | basename = cgit_repobasename(repo->url); |
109 | if (prefixcmp(ref, basename) != 0) { | 111 | if (prefixcmp(ref, basename) != 0) { |