author | Lars Hjemli <hjemli@gmail.com> | 2007-10-24 19:14:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 07:05:40 (UTC) |
commit | 13d2b0b25cf19de03c7cdcf8bb708be1168aeda7 (patch) (unidiff) | |
tree | 11241d302395aaffc2eca097465f5e019a123601 | |
parent | fd39489f4f49f9efe45c881d3f5f503c0068148a (diff) | |
download | cgit-13d2b0b25cf19de03c7cdcf8bb708be1168aeda7.zip cgit-13d2b0b25cf19de03c7cdcf8bb708be1168aeda7.tar.gz cgit-13d2b0b25cf19de03c7cdcf8bb708be1168aeda7.tar.bz2 |
Skip unknown header fields when parsing tags and commits
Both the commit- and tagparser failed to handle unexpected header fields.
This adds futureproofing by simply skipping any header we don't know/care
about.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | parsing.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -228,16 +228,19 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
228 | ret->committer = substr(p, t); | 228 | ret->committer = substr(p, t); |
229 | p = t; | 229 | p = t; |
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') |
242 | ret->subject = strdup("** empty **"); | 245 | ret->subject = strdup("** empty **"); |
243 | else | 246 | else |
@@ -287,15 +290,18 @@ struct taginfo *cgit_parse_tag(struct tag *tag) | |||
287 | p = t; | 290 | p = t; |
288 | t = strchr(t, '>') + 1; | 291 | t = strchr(t, '>') + 1; |
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; |
301 | } | 307 | } |