summaryrefslogtreecommitdiffstatshomepage
path: root/parsing.c
diff options
context:
space:
mode:
authorLars Hjemli2007-10-27 09:15:41 +0200
committerLars Hjemli2007-10-27 09:15:41 +0200
commit47bae9f58d5ecae437767b8e7835b23ad1804d0b (patch)
treed487a8ba237a3a04c43f6932d706e3f5f2307a65 /parsing.c
parentf214118c56aeeb8bc2c7f4618be58bbc463dd75f (diff)
parent13d2b0b25cf19de03c7cdcf8bb708be1168aeda7 (diff)
downloadcgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.tar.gz
Merge branch 'stable'
* stable: Skip unknown header fields when parsing tags and commits
Diffstat (limited to 'parsing.c')
-rw-r--r--parsing.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/parsing.c b/parsing.c
index 2c05c09..ddbafd5 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)