Merge branch 'stable'

* stable:
  Skip unknown header fields when parsing tags and commits

1 file changed, 6 insertions, 0 deletions

diff --git a/parsing.c b/parsing.cindex 2c05c093..ddbafd5d 100644--- a/parsing.c+++ b/parsing.c@@ -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)
diff --git a/parsing.c b/parsing.c
index 2c05c093..ddbafd5d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -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)