X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/a69061fdb7380d73715aeb3a0da6e91a24df90e4..e903011c4457c24c0095f270ca5e78c40729434f:/parsing.c

diff --git a/parsing.c b/parsing.c
index 8aad1dd..8e15e5a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,21 @@ 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 the reading of yet another configfile after 16 invocations */
+	if (nesting++ > 16)
+		return -1;
+	if (!(f = fopen(filename, "r")))
 		return -1;
-
 	while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
 		(*fn)(line, value);
-
 	fclose(f);
-	return ret;
+	return 0;
 }
 
 char *convert_query_hexchar(char *txt)
@@ -201,13 +203,13 @@ 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;
 	}
@@ -220,7 +222,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 
 	p = data;
 
-	while (p) {
+	while (p && *p) {
 		if (*p == '\n')
 			break;
 
@@ -238,7 +240,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;