| author | Ondrej Jirman <ondrej.jirman@zonio.net> | 2007-05-26 01:27:49 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-31 08:24:43 (UTC) |
| commit | 6130231ed5e7475836a44d79d5f09e300e71a407 (patch) (unidiff) | |
| tree | 9fc492315a0e9f23f1e8b0fba2420c2626a82152 /parsing.c | |
| parent | a922615dae5d1f7b932dd1fc5a5f121748d96c5a (diff) | |
| download | cgit-6130231ed5e7475836a44d79d5f09e300e71a407.zip cgit-6130231ed5e7475836a44d79d5f09e300e71a407.tar.gz cgit-6130231ed5e7475836a44d79d5f09e300e71a407.tar.bz2 | |
Check for NULL commit buffer in cgit_parse_commit()
This can be NULL, so try not to segfault.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | parsing.c | 3 |
1 files changed, 3 insertions, 0 deletions
| @@ -187,32 +187,35 @@ char *substr(const char *head, const char *tail) | |||
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
| 190 | { | 190 | { |
| 191 | struct commitinfo *ret; | 191 | struct commitinfo *ret; |
| 192 | char *p = commit->buffer, *t = commit->buffer; | 192 | char *p = commit->buffer, *t = commit->buffer; |
| 193 | 193 | ||
| 194 | ret = xmalloc(sizeof(*ret)); | 194 | ret = xmalloc(sizeof(*ret)); |
| 195 | ret->commit = commit; | 195 | ret->commit = commit; |
| 196 | ret->author = NULL; | 196 | ret->author = NULL; |
| 197 | ret->author_email = NULL; | 197 | ret->author_email = NULL; |
| 198 | ret->committer = NULL; | 198 | ret->committer = NULL; |
| 199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
| 200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
| 201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
| 202 | 202 | ||
| 203 | if (p == NULL) | ||
| 204 | return ret; | ||
| 205 | |||
| 203 | if (strncmp(p, "tree ", 5)) | 206 | if (strncmp(p, "tree ", 5)) |
| 204 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
| 205 | else | 208 | else |
| 206 | p += 46; // "tree " + hex[40] + "\n" | 209 | p += 46; // "tree " + hex[40] + "\n" |
| 207 | 210 | ||
| 208 | while (!strncmp(p, "parent ", 7)) | 211 | while (!strncmp(p, "parent ", 7)) |
| 209 | p += 48; // "parent " + hex[40] + "\n" | 212 | p += 48; // "parent " + hex[40] + "\n" |
| 210 | 213 | ||
| 211 | if (!strncmp(p, "author ", 7)) { | 214 | if (!strncmp(p, "author ", 7)) { |
| 212 | p += 7; | 215 | p += 7; |
| 213 | t = strchr(p, '<') - 1; | 216 | t = strchr(p, '<') - 1; |
| 214 | ret->author = substr(p, t); | 217 | ret->author = substr(p, t); |
| 215 | p = t; | 218 | p = t; |
| 216 | t = strchr(t, '>') + 1; | 219 | t = strchr(t, '>') + 1; |
| 217 | ret->author_email = substr(p, t); | 220 | ret->author_email = substr(p, t); |
| 218 | ret->author_date = atol(++t); | 221 | ret->author_date = atol(++t); |