summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-17 07:19:05 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-17 07:24:36 (UTC)
commit8a631b1173b1abecc5a737b0e21751ddbabf9df2 (patch) (unidiff)
tree93320a0e21c1f13e936ccac66d250b28fa87acc1
parentfdd559abd6e6ec5e522dc5496b2bcabd36d6ba9d (diff)
downloadcgit-8a631b1173b1abecc5a737b0e21751ddbabf9df2.zip
cgit-8a631b1173b1abecc5a737b0e21751ddbabf9df2.tar.gz
cgit-8a631b1173b1abecc5a737b0e21751ddbabf9df2.tar.bz2
ui-tag.c: do not segfault when id is missing from query-string
The purpose of the tag page is to print info about a specific tag, but if no tag was specified on the query-string cgit used to segfault. With this patch, cgit will fallback to the value of the 'h' parameter instead (which is never NULL due to prepare_repo_cmd() in cgit.c). It will now also verify that the specified tagname is in fact a valid ref in the 'refs/tags/' namespace, i.e. specifying 'id=master' will trigger a 'Bad tag reference' error. Noticed-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tag.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui-tag.c b/ui-tag.c
index 0e056e0..8c263ab 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -28,25 +28,28 @@ static void print_tag_content(char *buf)
28 html_txt(++p); 28 html_txt(++p);
29 html("</div>"); 29 html("</div>");
30 } 30 }
31} 31}
32 32
33void cgit_print_tag(char *revname) 33void 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 (!revname)
41 revname = ctx.qry.head;
42
43 if (get_sha1(fmt("refs/tags/%s", revname), sha1)) {
41 cgit_print_error(fmt("Bad tag reference: %s", revname)); 44 cgit_print_error(fmt("Bad tag reference: %s", revname));
42 return; 45 return;
43 } 46 }
44 obj = parse_object(sha1); 47 obj = parse_object(sha1);
45 if (!obj) { 48 if (!obj) {
46 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); 49 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
47 return; 50 return;
48 } 51 }
49 if (obj->type == OBJ_TAG) { 52 if (obj->type == OBJ_TAG) {
50 tag = lookup_tag(sha1); 53 tag = lookup_tag(sha1);
51 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { 54 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
52 cgit_print_error(fmt("Bad tag object: %s", revname)); 55 cgit_print_error(fmt("Bad tag object: %s", revname));