diff options
author | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
commit | 6c66430e9658616e118d10af9c9ab48858a04e67 (patch) | |
tree | 2e83a411ed158f151df085c7f3836827753aecf7 /parsing.c | |
parent | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (diff) | |
parent | fa146ccabdd0de746a7076f0630af550e43d9088 (diff) | |
download | cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.gz cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.xz |
Merge tag 'v1.2.2' into local
CGIT v1.2.2
Diffstat (limited to 'parsing.c')
-rw-r--r-- | parsing.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -63,8 +63,7 @@ static char *substr(const char *head, const char *tail) if (tail < head) return xstrdup(""); buf = xmalloc(tail - head + 1); - strncpy(buf, head, tail - head); - buf[tail - head] = '\0'; + strlcpy(buf, head, tail - head + 1); return buf; } @@ -78,7 +77,7 @@ static void parse_user(const char *t, char **name, char **email, unsigned long * email_len = ident.mail_end - ident.mail_begin; *email = xmalloc(strlen("<") + email_len + strlen(">") + 1); - sprintf(*email, "<%.*s>", email_len, ident.mail_begin); + xsnprintf(*email, email_len + 3, "<%.*s>", email_len, ident.mail_begin); if (ident.date_begin) *date = strtoul(ident.date_begin, NULL, 10); @@ -130,7 +129,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) { const int sha1hex_len = 40; struct commitinfo *ret; - const char *p = get_cached_commit_buffer(commit, NULL); + const char *p = repo_get_commit_buffer(the_repository, commit, NULL); const char *t; ret = xcalloc(1, sizeof(struct commitinfo)); |