mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: Actually zero-terminate DNS and search list arrays

Browse source 
This worked pretty much by chance until now.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-09-26 23:22:31 +02:00
parent 2dbed699e7
commit dfc4513190
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
conf.c
View file

@ -546,13 +546,17 @@ static void get_dns(struct ctx *c)
if (end) if (end)
*end = 0; *end = 0;
if (dns4 - &c->dns4[0] < ARRAY_SIZE(c->dns4) && if (dns4 - &c->dns4[0] < ARRAY_SIZE(c->dns4) - 1 &&
inet_pton(AF_INET, p + 1, dns4)) inet_pton(AF_INET, p + 1, dns4)) {
dns4++; dns4++;
*dns4 = 0;
}
if (dns6 - &c->dns6[0] < ARRAY_SIZE(c->dns6) && if (dns6 - &c->dns6[0] < ARRAY_SIZE(c->dns6) - 1 &&
inet_pton(AF_INET6, p + 1, dns6)) inet_pton(AF_INET6, p + 1, dns6)) {
dns6++; dns6++;
memset(dns6, 0, sizeof(*dns6));
}
} else if (!dnss_set && strstr(buf, "search ") == buf && } else if (!dnss_set && strstr(buf, "search ") == buf &&
s == c->dns_search) { s == c->dns_search) {
end = strpbrk(buf, "\n"); end = strpbrk(buf, "\n");
@ -560,10 +564,11 @@ static void get_dns(struct ctx *c)
*end = 0; *end = 0;
p = strtok(buf, " \t"); p = strtok(buf, " \t");
while ((p = strtok(NULL, " \t")) && while (s - c->dns_search < ARRAY_SIZE(c->dns_search) - 1
s - c->dns_search < ARRAY_SIZE(c->dns_search)) { && (p = strtok(NULL, " \t"))) {
strncpy(s->n, p, sizeof(c->dns_search[0])); strncpy(s->n, p, sizeof(c->dns_search[0]));
s++; s++;
*s->n = 0;
} }
} }
} }