author | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 07:15:41 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 07:15:41 (UTC) |
commit | 47bae9f58d5ecae437767b8e7835b23ad1804d0b (patch) (unidiff) | |
tree | d487a8ba237a3a04c43f6932d706e3f5f2307a65 /parsing.c | |
parent | f214118c56aeeb8bc2c7f4618be58bbc463dd75f (diff) | |
parent | 13d2b0b25cf19de03c7cdcf8bb708be1168aeda7 (diff) | |
download | cgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.zip cgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.tar.gz cgit-47bae9f58d5ecae437767b8e7835b23ad1804d0b.tar.bz2 |
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
@@ -230,12 +230,15 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
230 | t = strchr(t, '>') + 1; | 230 | t = strchr(t, '>') + 1; |
231 | ret->committer_email = substr(p, t); | 231 | ret->committer_email = substr(p, t); |
232 | ret->committer_date = atol(++t); | 232 | ret->committer_date = atol(++t); |
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 | ||
239 | t = strchr(p, '\n'); | 242 | t = strchr(p, '\n'); |
240 | if (t) { | 243 | if (t) { |
241 | if (*t == '\0') | 244 | if (*t == '\0') |
@@ -289,12 +292,15 @@ struct taginfo *cgit_parse_tag(struct tag *tag) | |||
289 | ret->tagger_email = substr(p, t); | 292 | ret->tagger_email = substr(p, t); |
290 | ret->tagger_date = atol(++t); | 293 | ret->tagger_date = atol(++t); |
291 | } | 294 | } |
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) |
298 | ret->msg = xstrdup(p); | 304 | ret->msg = xstrdup(p); |
299 | free(data); | 305 | free(data); |
300 | return ret; | 306 | return ret; |