author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 15:37:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 15:37:47 (UTC) |
commit | 720b6ece90900df9f836a45d8e7f1cd56f62400a (patch) (unidiff) | |
tree | 217ed9ed3a2c87347caa8762c6b1319c4afeb839 | |
parent | c63aaff2adb83e5015841921fab233c2fe2e3b0a (diff) | |
download | cgit-720b6ece90900df9f836a45d8e7f1cd56f62400a.zip cgit-720b6ece90900df9f836a45d8e7f1cd56f62400a.tar.gz cgit-720b6ece90900df9f836a45d8e7f1cd56f62400a.tar.bz2 |
ui-tag: escape tagnames properly
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tag.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -24,56 +24,57 @@ static void print_tag_content(char *buf) | |||
24 | html_txt(buf); | 24 | html_txt(buf); |
25 | html("</div>"); | 25 | html("</div>"); |
26 | if (p) { | 26 | if (p) { |
27 | html("<div class='commit-msg'>"); | 27 | html("<div class='commit-msg'>"); |
28 | html_txt(++p); | 28 | html_txt(++p); |
29 | html("</div>"); | 29 | html("</div>"); |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | void cgit_print_tag(char *revname) | 33 | void cgit_print_tag(char *revname) |
34 | { | 34 | { |
35 | unsigned char sha1[20]; | 35 | unsigned char sha1[20]; |
36 | struct object *obj; | 36 | struct object *obj; |
37 | struct tag *tag; | 37 | struct tag *tag; |
38 | struct taginfo *info; | 38 | struct taginfo *info; |
39 | 39 | ||
40 | if (get_sha1(revname, sha1)) { | 40 | if (get_sha1(revname, sha1)) { |
41 | cgit_print_error(fmt("Bad tag reference: %s", revname)); | 41 | cgit_print_error(fmt("Bad tag reference: %s", revname)); |
42 | return; | 42 | return; |
43 | } | 43 | } |
44 | obj = parse_object(sha1); | 44 | obj = parse_object(sha1); |
45 | if (!obj) { | 45 | if (!obj) { |
46 | cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); | 46 | cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); |
47 | return; | 47 | return; |
48 | } | 48 | } |
49 | if (obj->type == OBJ_TAG) { | 49 | if (obj->type == OBJ_TAG) { |
50 | tag = lookup_tag(sha1); | 50 | tag = lookup_tag(sha1); |
51 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { | 51 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { |
52 | cgit_print_error(fmt("Bad tag object: %s", revname)); | 52 | cgit_print_error(fmt("Bad tag object: %s", revname)); |
53 | return; | 53 | return; |
54 | } | 54 | } |
55 | html("<table class='commit-info'>\n"); | 55 | html("<table class='commit-info'>\n"); |
56 | htmlf("<tr><td>Tag name</td><td>%s (%s)</td></tr>\n", | 56 | htmlf("<tr><td>Tag name</td><td>"); |
57 | revname, sha1_to_hex(sha1)); | 57 | html_txt(revname); |
58 | htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); | ||
58 | if (info->tagger_date > 0) { | 59 | if (info->tagger_date > 0) { |
59 | html("<tr><td>Tag date</td><td>"); | 60 | html("<tr><td>Tag date</td><td>"); |
60 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); | 61 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); |
61 | html("</td></tr>\n"); | 62 | html("</td></tr>\n"); |
62 | } | 63 | } |
63 | if (info->tagger) { | 64 | if (info->tagger) { |
64 | html("<tr><td>Tagged by</td><td>"); | 65 | html("<tr><td>Tagged by</td><td>"); |
65 | html_txt(info->tagger); | 66 | html_txt(info->tagger); |
66 | if (info->tagger_email) { | 67 | if (info->tagger_email) { |
67 | html(" "); | 68 | html(" "); |
68 | html_txt(info->tagger_email); | 69 | html_txt(info->tagger_email); |
69 | } | 70 | } |
70 | html("</td></tr>\n"); | 71 | html("</td></tr>\n"); |
71 | } | 72 | } |
72 | html("<tr><td>Tagged object</td><td>"); | 73 | html("<tr><td>Tagged object</td><td>"); |
73 | cgit_object_link(tag->tagged); | 74 | cgit_object_link(tag->tagged); |
74 | html("</td></tr>\n"); | 75 | html("</td></tr>\n"); |
75 | html("</table>\n"); | 76 | html("</table>\n"); |
76 | print_tag_content(info->msg); | 77 | print_tag_content(info->msg); |
77 | } | 78 | } |
78 | return; | 79 | return; |
79 | } | 80 | } |