diff options
| author | Lars Hjemli | 2007-10-27 09:15:41 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2007-10-27 09:15:41 +0200 |
| commit | 47bae9f58d5ecae437767b8e7835b23ad1804d0b (patch) | |
| tree | d487a8ba237a3a04c43f6932d706e3f5f2307a65 | |
| parent | Merge branch 'stable' (diff) | |
| parent | Skip unknown header fields when parsing tags and commits (diff) | |
| download | cgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.tar.gz cgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.zip | |
Merge branch 'stable'
* stable: Skip unknown header fields when parsing tags and commits
| -rw-r--r-- | parsing.c | 6 |
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) | |||
| 233 | p = strchr(t, '\n') + 1; | 233 | p = strchr(t, '\n') + 1; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | while (*p && (*p != '\n')) | ||
| 237 | p = strchr(p, '\n') + 1; // skip unknown header fields | ||
| 238 | |||
| 236 | while (*p == '\n') | 239 | while (*p == '\n') |
| 237 | p = strchr(p, '\n') + 1; | 240 | p = strchr(p, '\n') + 1; |
| 238 | 241 | ||
| @@ -292,6 +295,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag) | |||
| 292 | p = strchr(p, '\n') + 1; | 295 | p = strchr(p, '\n') + 1; |
| 293 | } | 296 | } |
| 294 | 297 | ||
| 298 | while (p && *p && (*p != '\n')) | ||
| 299 | p = strchr(p, '\n') + 1; // skip unknown tag fields | ||
| 300 | |||
| 295 | while (p && (*p == '\n')) | 301 | while (p && (*p == '\n')) |
| 296 | p = strchr(p, '\n') + 1; | 302 | p = strchr(p, '\n') + 1; |
| 297 | if (p && *p) | 303 | if (p && *p) |