summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-10-27 11:55:44 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-10-27 11:55:44 (UTC)
commit0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2 (patch) (side-by-side diff)
tree251b7d213cf6e6b7e0427da9613e10c8b85d5e48
parentb4d4a25aa481aa3ac8ad69df4dfa53eaa5de6173 (diff)
parentc61360fea0357672d2ab84a2c5a41ae1569f5d8a (diff)
downloadcgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.zip
cgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.tar.gz
cgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.tar.bz2
Merge branch 'stable'
* stable: cgit_parse_commit(): Add missing call to xstrdup()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/parsing.c b/parsing.c
index ddbafd5..30e7648 100644
--- a/parsing.c
+++ b/parsing.c
@@ -213,72 +213,72 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
if (!strncmp(p, "author ", 7)) {
p += 7;
t = strchr(p, '<') - 1;
ret->author = substr(p, t);
p = t;
t = strchr(t, '>') + 1;
ret->author_email = substr(p, t);
ret->author_date = atol(++t);
p = strchr(t, '\n') + 1;
}
if (!strncmp(p, "committer ", 9)) {
p += 9;
t = strchr(p, '<') - 1;
ret->committer = substr(p, t);
p = t;
t = strchr(t, '>') + 1;
ret->committer_email = substr(p, t);
ret->committer_date = atol(++t);
p = strchr(t, '\n') + 1;
}
while (*p && (*p != '\n'))
p = strchr(p, '\n') + 1; // skip unknown header fields
while (*p == '\n')
p = strchr(p, '\n') + 1;
t = strchr(p, '\n');
if (t) {
if (*t == '\0')
- ret->subject = strdup("** empty **");
+ ret->subject = "** empty **";
else
ret->subject = substr(p, t);
p = t + 1;
while (*p == '\n')
p = strchr(p, '\n') + 1;
- ret->msg = p;
+ ret->msg = xstrdup(p);
} else
ret->subject = substr(p, p+strlen(p));
return ret;
}
struct taginfo *cgit_parse_tag(struct tag *tag)
{
void *data;
enum object_type type;
unsigned long size;
char *p, *t;
struct taginfo *ret;
data = read_sha1_file(tag->object.sha1, &type, &size);
if (!data || type != OBJ_TAG) {
free(data);
return 0;
}
ret = xmalloc(sizeof(*ret));
ret->tagger = NULL;
ret->tagger_email = NULL;
ret->tagger_date = 0;
ret->msg = NULL;
p = data;
while (p && *p) {
if (*p == '\n')
break;