[v9_11] clean up bufsize errors

(cherry picked from commit 9b729a06b0)
This commit is contained in:
Evan Hunt 2017-09-13 21:19:11 -07:00
parent bd911976d5
commit 4c2dd50d64
2 changed files with 4 additions and 2 deletions

View file

@ -1648,7 +1648,7 @@ dns_name_tofilenametext(dns_name_t *name, isc_boolean_t omit_final_dot,
trem--;
nlen--;
} else {
if (trem < 3)
if (trem < 4)
return (ISC_R_NOSPACE);
snprintf(tdata, trem, "%%%02X", c);
tdata += 3;

View file

@ -1388,12 +1388,14 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
size += strlen(zone->db_argv[i]) + 1;
mem = isc_mem_allocate(mctx, size);
if (mem != NULL) {
size_t remaining;
tmp = mem;
tmp2 = mem;
tmp2 += (zone->db_argc + 1) * sizeof(char *);
for (i = 0; i < zone->db_argc; i++) {
remaining = (size_t)(mem - tmp2);
*tmp++ = tmp2;
strlcpy(tmp2, zone->db_argv[i], size);
strlcpy(tmp2, zone->db_argv[i], remaining);
tmp2 += strlen(tmp2) + 1;
}
*tmp = NULL;