|
diff --git a/parsing.c b/parsing.c index 2c05c09..ddbafd5 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -220,32 +220,35 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) |
220 | ret->author_email = substr(p, t); |
220 | ret->author_email = substr(p, t); |
221 | ret->author_date = atol(++t); |
221 | ret->author_date = atol(++t); |
222 | p = strchr(t, '\n') + 1; |
222 | p = strchr(t, '\n') + 1; |
223 | } |
223 | } |
224 | |
224 | |
225 | if (!strncmp(p, "committer ", 9)) { |
225 | if (!strncmp(p, "committer ", 9)) { |
226 | p += 9; |
226 | p += 9; |
227 | t = strchr(p, '<') - 1; |
227 | t = strchr(p, '<') - 1; |
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 |
244 | ret->subject = substr(p, t); |
247 | ret->subject = substr(p, t); |
245 | p = t + 1; |
248 | p = t + 1; |
246 | |
249 | |
247 | while (*p == '\n') |
250 | while (*p == '\n') |
248 | p = strchr(p, '\n') + 1; |
251 | p = strchr(p, '\n') + 1; |
249 | ret->msg = p; |
252 | ret->msg = p; |
250 | } else |
253 | } else |
251 | ret->subject = substr(p, p+strlen(p)); |
254 | ret->subject = substr(p, p+strlen(p)); |
@@ -279,23 +282,26 @@ struct taginfo *cgit_parse_tag(struct tag *tag) |
279 | while (p && *p) { |
282 | while (p && *p) { |
280 | if (*p == '\n') |
283 | if (*p == '\n') |
281 | break; |
284 | break; |
282 | |
285 | |
283 | if (!strncmp(p, "tagger ", 7)) { |
286 | if (!strncmp(p, "tagger ", 7)) { |
284 | p += 7; |
287 | p += 7; |
285 | t = strchr(p, '<') - 1; |
288 | t = strchr(p, '<') - 1; |
286 | ret->tagger = substr(p, t); |
289 | ret->tagger = substr(p, t); |
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 | } |
|