Restrict deep nesting of configfiles

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index 8aad1dd39ee531713a19fb902dbcacf2a77ccfa9..36b0f0c93399f78c8fb3336efafda20cc1b417f2 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,23 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
 
 int cgit_read_config(const char *filename, configfn fn)
 {
-       int ret = 0, len;
+       static int nesting;
+       int len;
        char line[256];
        const char *value;
-       FILE *f = fopen(filename, "r");
+       FILE *f;
 
-       if (!f)
+       /* cancel deeply nested include-commands */
+       if (nesting > 8)
                return -1;
-
+       if (!(f = fopen(filename, "r")))
+               return -1;
+       nesting++;
        while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
                (*fn)(line, value);
-
+       nesting--;
        fclose(f);
-       return ret;
+       return 0;
 }
 
 char *convert_query_hexchar(char *txt)
@@ -106,7 +110,7 @@ int cgit_parse_query(char *txt, configfn fn)
                return 0;
 
        t = txt = xstrdup(txt);
- 
+
        while((c=*t) != '\0') {
                if (c=='=') {
                        *t = '\0';
@@ -201,17 +205,17 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
        void *data;
-       char type[20];
+       enum object_type type;
        unsigned long size;
        char *p, *t;
        struct taginfo *ret;
 
-       data = read_sha1_file(tag->object.sha1, type, &size);
-       if (!data || strcmp(type, tag_type)) {
+       data = read_sha1_file(tag->object.sha1, &type, &size);
+       if (!data || type != OBJ_TAG) {
                free(data);
                return 0;
        }
-       
+
        ret = xmalloc(sizeof(*ret));
        ret->tagger = NULL;
        ret->tagger_email = NULL;
@@ -220,7 +224,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 
        p = data;
 
-       while (p) {
+       while (p && *p) {
                if (*p == '\n')
                        break;
 
@@ -238,7 +242,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 
        while (p && (*p == '\n'))
                p = strchr(p, '\n') + 1;
-       if (p)
+       if (p && *p)
                ret->msg = xstrdup(p);
        free(data);
        return ret;