summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-01-16 17:41:01 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-01-16 17:41:01 (UTC)
commit66091f934a2d064ae55095cdc5ae008b43ea60fe (patch) (side-by-side diff)
tree3faeafcfff2b21313464d9b919cd4b76b12a5fe9
parent5cd2bf7e7f3f3daf6107cd3a269bad78e342de70 (diff)
downloadcgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.zip
cgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.tar.gz
cgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.tar.bz2
Handle empty/malformed commit messages
An empty commit message would trigger a segfault in the current cgit_parse_commit(). Also, make sure that all char-pointers are properly initialized.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/parsing.c b/parsing.c
index 4173dd4..4412dee 100644
--- a/parsing.c
+++ b/parsing.c
@@ -142,12 +142,18 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
{
struct commitinfo *ret;
char *p = commit->buffer, *t = commit->buffer;
ret = xmalloc(sizeof(*ret));
ret->commit = commit;
+ ret->author = NULL;
+ ret->author_email = NULL;
+ ret->committer = NULL;
+ ret->committer_email = NULL;
+ ret->subject = NULL;
+ ret->msg = NULL;
if (strncmp(p, "tree ", 5))
die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
else
p += 46; // "tree " + hex[40] + "\n"
@@ -177,15 +183,16 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
}
while (*p == '\n')
p = strchr(p, '\n') + 1;
t = strchr(p, '\n');
- ret->subject = substr(p, t);
- p = t + 1;
-
- while (*p == '\n')
- p = strchr(p, '\n') + 1;
- ret->msg = p;
+ if (t && *t) {
+ ret->subject = substr(p, t);
+ p = t + 1;
+ while (*p == '\n')
+ p = strchr(p, '\n') + 1;
+ ret->msg = p;
+ }
return ret;
}