upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-28 09:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

use snprintf; check the result of putstr

Browse source
This commit is contained in:
Mark Andrews 2013-12-10 08:55:26 +11:00
parent 8539d19c04
commit 06a0b00bb6
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bin/named/server.c
View file

@ -6891,7 +6891,7 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
isc_buffer_t buf;
dns_view_t *view = NULL;
dns_rdataclass_t rdclass;
char problem[1024] = "";
char problem[DNS_NAME_FORMATSIZE + 500] = "";
REQUIRE(zonep != NULL && *zonep == NULL);
REQUIRE(zonename == NULL || *zonename == NULL);
@ -6944,21 +6944,24 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
ISC_TF(classtxt == NULL),
rdclass, zonep);
if (result == ISC_R_NOTFOUND)
sprintf(problem, "no matching zone '%s' in any view",
zonetxt);
snprintf(problem, sizeof(problem),
"no matching zone '%s' in any view",
zonetxt);
} else {
result = dns_viewlist_find(&server->viewlist, viewtxt,
rdclass, &view);
if (result != ISC_R_SUCCESS) {
sprintf(problem, "no matching view '%s'", viewtxt);
snprintf(problem, sizeof(problem),
"no matching view '%s'", viewtxt);
goto fail1;
}
result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
0, NULL, zonep);
if (result != ISC_R_SUCCESS) {
sprintf(problem, "no matching zone '%s' in view '%s'",
zonetxt, viewtxt);
snprintf(problem, sizeof(problem),
"no matching zone '%s' in view '%s'",
zonetxt, viewtxt);
goto fail1;
}
}
@ -6970,8 +6973,12 @@ zone_from_args(ns_server_t *server, char *args, const char *zonetxt,
result = ISC_R_NOTFOUND;
fail1:
if (result != ISC_R_SUCCESS) {
putstr(text, problem);
isc_buffer_putuint8(text, 0);
isc_result_t tresult;
tresult = putstr(text, problem);
if (tresult == ISC_R_SUCCESS &&
isc_buffer_availablelength(text) > 0U)
isc_buffer_putuint8(text, 0);
}
if (view != NULL)