Commit 85ed1dca authored by Ondřej Surý's avatar Ondřej Surý

Replace strlcpy/strlcat with strncpy/strncat, they are perfectly safe for this kind of usage here

parent 29db4602
...@@ -616,7 +616,7 @@ printandfree(struct summary *summary) { ...@@ -616,7 +616,7 @@ printandfree(struct summary *summary) {
} }
if (addr == NULL) if (addr == NULL)
strlcpy(addrbuf, "<unknown>", sizeof(addrbuf)); strncpy(addrbuf, "<unknown>", sizeof(addrbuf));
else else
inet_ntop(summary->storage.ss_family, addr, inet_ntop(summary->storage.ss_family, addr,
addrbuf, sizeof(addrbuf)); addrbuf, sizeof(addrbuf));
...@@ -630,7 +630,7 @@ printandfree(struct summary *summary) { ...@@ -630,7 +630,7 @@ printandfree(struct summary *summary) {
if (opts[i].what != 0 && (opts[i].what & what) == 0) if (opts[i].what != 0 && (opts[i].what & what) == 0)
continue; continue;
if (summary->results[i][0] == 0) if (summary->results[i][0] == 0)
strlcpy(summary->results[i], "skipped", 100); strncpy(summary->results[i], "skipped", 100);
if (strcmp(opts[i].name, "do") == 0) if (strcmp(opts[i].name, "do") == 0)
x = i; x = i;
if (strcmp(opts[i].name, "ednstcp") == 0 && x != -1 && if (strcmp(opts[i].name, "ednstcp") == 0 && x != -1 &&
...@@ -789,8 +789,8 @@ freeitem(struct workitem * item) { ...@@ -789,8 +789,8 @@ freeitem(struct workitem * item) {
static void static void
addtag(struct workitem *item, const char *tag) { addtag(struct workitem *item, const char *tag) {
char *result = item->summary->results[item->test]; char *result = item->summary->results[item->test];
if (result[0]) strlcat(result, ",", 100); if (result[0]) strncat(result, ",", 100);
strlcat(result, tag, 100); strncat(result, tag, 100);
} }
/* /*
...@@ -929,7 +929,7 @@ dotest(struct workitem *item) { ...@@ -929,7 +929,7 @@ dotest(struct workitem *item) {
*/ */
dn_expand(item->buf, item->buf + n, item->buf + 12, dn_expand(item->buf, item->buf + n, item->buf + 12,
name, sizeof(name)); name, sizeof(name));
strlcpy(item->summary->zone, name, strncpy(item->summary->zone, name,
sizeof(item->summary->zone)); sizeof(item->summary->zone));
} }
...@@ -1183,12 +1183,12 @@ dolookup(struct workitem *item, int type) { ...@@ -1183,12 +1183,12 @@ dolookup(struct workitem *item, int type) {
switch (type) { switch (type) {
case ns_t_ns: case ns_t_ns:
strlcpy(item->summary->zone, name, strncpy(item->summary->zone, name,
sizeof(item->summary->zone)); sizeof(item->summary->zone));
break; break;
case ns_t_a: case ns_t_a:
case ns_t_aaaa: case ns_t_aaaa:
strlcpy(item->summary->ns, name, strncpy(item->summary->ns, name,
sizeof(item->summary->zone)); sizeof(item->summary->zone));
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment