Restrict deep nesting of configfiles

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 9388f5fbf69c3df2f12d30f871d79509107b4a84..b99ea9840e6c2cece046a336f0f077d073fb9122 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,7 +8,7 @@
 
 #include "cgit.h"
 
-int items = 0;
+static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
@@ -22,7 +22,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
        if (commit && !parse_commit(commit)){
                info = cgit_parse_commit(commit);
                html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "log", 
+               url = cgit_pageurl(cgit_query_repo, "log",
                                   fmt("h=%s", refname));
                html_link_open(url, NULL, NULL);
                html_txt(buf);
@@ -32,7 +32,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit", 
+               url = cgit_pageurl(cgit_query_repo, "commit",
                                   fmt("id=%s", sha1_to_hex(sha1)));
                html_link_open(url, NULL, NULL);
                html_ntxt(cgit_max_msg_len, info->subject);
@@ -61,14 +61,23 @@ static void cgit_print_object_ref(struct object *obj)
        else
                page = "view";
 
-       url = cgit_pageurl(cgit_query_repo, page, 
+       url = cgit_pageurl(cgit_query_repo, page,
                           fmt("id=%s", sha1_to_hex(obj->sha1)));
        html_link_open(url, NULL, NULL);
-       htmlf("%s %s", typename(obj->type), 
+       htmlf("%s %s", typename(obj->type),
              sha1_to_hex(obj->sha1));
        html_link_close();
 }
 
+static void print_tag_header()
+{
+       html("<tr class='nohover'><th class='left'>Tag</th>"
+            "<th class='left'>Created</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Reference</th></tr>\n");
+       header = 1;
+}
+
 static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
 {
@@ -76,7 +85,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
- 
+
        strncpy(buf, refname, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
@@ -85,15 +94,10 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 2;
-               if (!items) {
-                       html("<tr class='nohover'><th class='left'>Tag</th>"
-                            "<th class='left'>Created</th>"
-                            "<th class='left'>Author</th>"
-                            "<th class='left'>Reference</th></tr>\n");
-               }
-               items++;
+               if (!header)
+                       print_tag_header();
                html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "view", 
+               url = cgit_pageurl(cgit_query_repo, "view",
                                   fmt("id=%s", sha1_to_hex(sha1)));
                html_link_open(url, NULL, NULL);
                html_txt(buf);
@@ -108,6 +112,8 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                cgit_print_object_ref(tag->tagged);
                html("</td></tr>\n");
        } else {
+               if (!header)
+                       print_tag_header();
                html("<tr><td>");
                html_txt(buf);
                html("</td><td colspan='2'/><td>");
@@ -124,6 +130,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
+       unsigned char fileid[20];
 
        if (prefixcmp(refname, "refs/archives"))
                return 0;
@@ -135,18 +142,20 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
-               hashcpy(sha1, tag->tagged->sha1);
+               hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
+       } else {
+               hashcpy(fileid, sha1);
        }
-       if (!items) {
+       if (!header) {
                html("<table>");
                html("<tr><th>Downloads</th></tr>");
+               header = 1;
        }
-       items++;
        html("<tr><td>");
        url = cgit_pageurl(cgit_query_repo, "blob",
-                          fmt("id=%s&path=%s", sha1_to_hex(sha1),
+                          fmt("id=%s&path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, NULL);
        html_txt(buf);
@@ -166,15 +175,15 @@ static void cgit_print_branches()
 
 static void cgit_print_tags()
 {
-       items = 0;
+       header = 0;
        for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 static void cgit_print_archives()
 {
-       items = 0;
+       header = 0;
        for_each_ref(cgit_print_archive_cb, NULL);
-       if (items)
+       if (header)
                html("</table>");
 }