commit - 71fee5a34a12ea7a545b3c4dfbe91023c8f7c69a
commit + bf31a716e240db9b58ddd53f468b3b23e49237c2
blob - ebf6a99d8a06304aae4cf3f790bc522fc3e78c82
blob + 438b7c79398bfb067efb31254e09c72894093bf5
--- lib/privsep.c
+++ lib/privsep.c
(*commit)->committer_time = icommit->committer_time;
(*commit)->committer_gmtoff = icommit->committer_gmtoff;
- if (icommit->author_len == 0) {
- (*commit)->author = strdup("");
- if ((*commit)->author == NULL) {
- err = got_error_from_errno("strdup");
- goto done;
- }
- } else {
- (*commit)->author = malloc(icommit->author_len + 1);
- if ((*commit)->author == NULL) {
- err = got_error_from_errno("malloc");
- goto done;
- }
- memcpy((*commit)->author, imsg->data + len,
- icommit->author_len);
- (*commit)->author[icommit->author_len] = '\0';
+ (*commit)->author = strndup(imsg->data + len, icommit->author_len);
+ if ((*commit)->author == NULL) {
+ err = got_error_from_errno("strndup");
+ goto done;
}
len += icommit->author_len;
- if (icommit->committer_len == 0) {
- (*commit)->committer = strdup("");
- if ((*commit)->committer == NULL) {
- err = got_error_from_errno("strdup");
- goto done;
- }
- } else {
- (*commit)->committer =
- malloc(icommit->committer_len + 1);
- if ((*commit)->committer == NULL) {
- err = got_error_from_errno("malloc");
- goto done;
- }
- memcpy((*commit)->committer, imsg->data + len,
- icommit->committer_len);
- (*commit)->committer[icommit->committer_len] = '\0';
+ (*commit)->committer = strndup(imsg->data + len,
+ icommit->committer_len);
+ if ((*commit)->committer == NULL) {
+ err = got_error_from_errno("strndup");
+ goto done;
}
len += icommit->committer_len;
memcpy((*tag)->id.sha1, itag->id, SHA1_DIGEST_LENGTH);
- if (itag->tag_len == 0) {
- (*tag)->tag = strdup("");
- if ((*tag)->tag == NULL) {
- err = got_error_from_errno("strdup");
- break;
- }
- } else {
- (*tag)->tag = malloc(itag->tag_len + 1);
- if ((*tag)->tag == NULL) {
- err = got_error_from_errno("malloc");
- break;
- }
- memcpy((*tag)->tag, imsg.data + len,
- itag->tag_len);
- (*tag)->tag[itag->tag_len] = '\0';
+ (*tag)->tag = strndup(imsg.data + len, itag->tag_len);
+ if ((*tag)->tag == NULL) {
+ err = got_error_from_errno("strndup");
+ break;
}
len += itag->tag_len;
(*tag)->tagger_time = itag->tagger_time;
(*tag)->tagger_gmtoff = itag->tagger_gmtoff;
- if (itag->tagger_len == 0) {
- (*tag)->tagger = strdup("");
- if ((*tag)->tagger == NULL) {
- err = got_error_from_errno("strdup");
- break;
- }
- } else {
- (*tag)->tagger = malloc(itag->tagger_len + 1);
- if ((*tag)->tagger == NULL) {
- err = got_error_from_errno("malloc");
- break;
- }
- memcpy((*tag)->tagger, imsg.data + len,
- itag->tagger_len);
- (*tag)->tagger[itag->tagger_len] = '\0';
+ (*tag)->tagger = strndup(imsg.data + len, itag->tagger_len);
+ if ((*tag)->tagger == NULL) {
+ err = got_error_from_errno("strndup");
+ break;
}
len += itag->tagger_len;