summaryrefslogtreecommitdiffabout
path: root/parsing.c
Side-by-side diff
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/parsing.c b/parsing.c
index 8e15e5a..36b0f0c 100644
--- a/parsing.c
+++ b/parsing.c
@@ -69,15 +69,17 @@ int cgit_read_config(const char *filename, configfn fn)
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;
}
@@ -107,9 +109,9 @@ int cgit_parse_query(char *txt, configfn fn)
if (!txt)
return 0;
t = txt = xstrdup(txt);
-
+
while((c=*t) != '\0') {
if (c=='=') {
*t = '\0';
value = t+1;
@@ -212,9 +214,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
if (!data || type != OBJ_TAG) {
free(data);
return 0;
}
-
+
ret = xmalloc(sizeof(*ret));
ret->tagger = NULL;
ret->tagger_email = NULL;
ret->tagger_date = 0;