| -rw-r--r-- | parsing.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -65,23 +65,25 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize) int cgit_read_config(const char *filename, configfn fn) { static int nesting; int len; char line[256]; const char *value; FILE *f; - /* cancel the reading of yet another configfile after 16 invocations */ - if (nesting++ > 16) + /* 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 0; } char *convert_query_hexchar(char *txt) { int d1, d2; if (strlen(txt) < 3) { @@ -103,17 +105,17 @@ char *convert_query_hexchar(char *txt) int cgit_parse_query(char *txt, configfn fn) { char *t, *value = NULL, c; if (!txt) return 0; t = txt = xstrdup(txt); - + while((c=*t) != '\0') { if (c=='=') { *t = '\0'; value = t+1; } else if (c=='+') { *t = ' '; } else if (c=='%') { t = convert_query_hexchar(t); @@ -208,17 +210,17 @@ struct taginfo *cgit_parse_tag(struct tag *tag) char *p, *t; struct taginfo *ret; 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; ret->tagger_date = 0; ret->msg = NULL; p = data; |