Merge branch 'stable'

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index 74a248449f35fb2a5331f571d3bea30a2806acab..ddbafd5df4cb5221da407ffd9c566afb0c69f8d2 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -168,7 +168,7 @@ void cgit_parse_url(const char *url)
                if (p) {
                        p[0] = '\0';
                        if (p[1])
-                               cgit_query_path = xstrdup(p + 1);
+                               cgit_query_path = trim_end(p + 1, '/');
                }
                cgit_cmd = cgit_get_cmd_index(cmd + 1);
                cgit_query_page = xstrdup(cmd + 1);
@@ -233,6 +233,9 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = strchr(t, '\n') + 1;
        }
 
+       while (*p && (*p != '\n'))
+               p = strchr(p, '\n') + 1; // skip unknown header fields
+
        while (*p == '\n')
                p = strchr(p, '\n') + 1;
 
@@ -292,6 +295,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
                p = strchr(p, '\n') + 1;
        }
 
+       while (p && *p && (*p != '\n'))
+               p = strchr(p, '\n') + 1; // skip unknown tag fields
+
        while (p && (*p == '\n'))
                p = strchr(p, '\n') + 1;
        if (p && *p)