mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

4426. [bug] Addressed Coverity warnings. [RT #42908]

Browse Source
This commit is contained in:
Witold Krecicki 2016-07-27 15:45:58 +02:00
parent 49834f2f8d
commit fe6db06ced
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
4426. [bug] Addressed Coverity warnings. [RT #42908]
4425. [bug] arpaname, dnstap-read and named-rrchecker were not 4425. [bug] arpaname, dnstap-read and named-rrchecker were not
being installed into ${prefix}/bin. Tidy up being installed into ${prefix}/bin. Tidy up
installation issues with CHANGE 4421. [RT #42910] installation issues with CHANGE 4421. [RT #42910]

33
bin/named/server.c
View File

@ -10734,6 +10734,7 @@ nzf_append(dns_view_t *view, const cfg_obj_t *zconfig) {
isc_result_t result; isc_result_t result;
off_t offset; off_t offset;
FILE *fp = NULL; FILE *fp = NULL;
isc_boolean_t offsetok = ISC_FALSE;
LOCK(&view->new_zone_lock); LOCK(&view->new_zone_lock);
@ -10741,16 +10742,38 @@ nzf_append(dns_view_t *view, const cfg_obj_t *zconfig) {
CHECK(isc_stdio_seek(fp, 0, SEEK_END)); CHECK(isc_stdio_seek(fp, 0, SEEK_END));
CHECK(isc_stdio_tell(fp, &offset)); CHECK(isc_stdio_tell(fp, &offset));
offsetok = ISC_TRUE;
if (offset == 0) if (offset == 0)
CHECK(add_comment(fp, view->name)); CHECK(add_comment(fp, view->name));
CHECK(isc_stdio_write("zone ", 5, 1, fp, NULL)); CHECK(isc_stdio_write("zone ", 5, 1, fp, NULL));
cfg_printx(zconfig, CFG_PRINTER_ONELINE, dumpzone, fp); cfg_printx(zconfig, CFG_PRINTER_ONELINE, dumpzone, fp);
CHECK(isc_stdio_write(";\n", 2, 1, fp, NULL)); CHECK(isc_stdio_write(";\n", 2, 1, fp, NULL));
CHECK(isc_stdio_flush(fp));
CHECK(isc_stdio_close(fp));
fp = NULL;
cleanup: cleanup:
isc_stdio_flush(fp); if (fp != NULL) {
isc_stdio_close(fp); (void)isc_stdio_close(fp);
if (offsetok) {
isc_result_t result2;
result2 = isc_file_truncate(view->new_zone_file,
offset);
if (result2 != ISC_R_SUCCESS) {
isc_log_write(ns_g_lctx,
NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER,
ISC_LOG_ERROR,
"Error truncating NZF file '%s' "
"during rollback from append: "
"%s",
view->new_zone_file,
isc_result_totext(result2));
}
}
}
UNLOCK(&view->new_zone_lock); UNLOCK(&view->new_zone_lock);
return (result); return (result);
} }
@ -11871,7 +11894,6 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
dns_zone_t *mayberaw; dns_zone_t *mayberaw;
dns_view_t *view = NULL; dns_view_t *view = NULL;
char zonename[DNS_NAME_FORMATSIZE]; char zonename[DNS_NAME_FORMATSIZE];
isc_boolean_t exclusive = ISC_FALSE;
isc_boolean_t cleanup = ISC_FALSE; isc_boolean_t cleanup = ISC_FALSE;
const char *ptr; const char *ptr;
isc_boolean_t added; isc_boolean_t added;
@ -11935,7 +11957,6 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
dns_zone_gettask(zone, &task); dns_zone_gettask(zone, &task);
isc_task_send(task, &dzevent); isc_task_send(task, &dzevent);
dz = NULL; dz = NULL;
dzevent = NULL;
/* Inform user about cleaning up stub/slave zone files */ /* Inform user about cleaning up stub/slave zone files */
dns_zone_getraw(zone, &raw); dns_zone_getraw(zone, &raw);
@ -11989,16 +12010,12 @@ ns_server_delzone(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
cleanup: cleanup:
if (exclusive)
isc_task_endexclusive(server->task);
if (isc_buffer_usedlength(*text) > 0) if (isc_buffer_usedlength(*text) > 0)
(void) putnull(text); (void) putnull(text);
if (raw != NULL) if (raw != NULL)
dns_zone_detach(&raw); dns_zone_detach(&raw);
if (zone != NULL) if (zone != NULL)
dns_zone_detach(&zone); dns_zone_detach(&zone);
if (dzevent != NULL)
isc_event_free(&dzevent);
if (dz != NULL) { if (dz != NULL) {
dns_zone_detach(&dz->zone); dns_zone_detach(&dz->zone);
isc_mem_put(ns_g_mctx, dz, sizeof(*dz)); isc_mem_put(ns_g_mctx, dz, sizeof(*dz));