ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

silence coverity warnings

Browse Source
This commit is contained in:
Mark Andrews
2013-04-11 17:07:50 +10:00
parent fce7ba0f07
commit 45b727f651
10 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/named/unix/dlz_dlopen_driver.c
View File

@@ -254,7 +254,9 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
}
/* Initialize the lock */
isc_mutex_init(&cd->lock);
result = isc_mutex_init(&cd->lock);
if (result != ISC_R_SUCCESS)
goto failed;
/* Open the library */
dlopen_flags = RTLD_NOW|RTLD_GLOBAL;
@@ -361,11 +363,11 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
failed:
dlopen_log(ISC_LOG_ERROR, "dlz_dlopen of '%s' failed", dlzname);
if (cd->dl_path)
if (cd->dl_path != NULL)
isc_mem_free(mctx, cd->dl_path);
if (cd->dlzname)
if (cd->dlzname != NULL)
isc_mem_free(mctx, cd->dlzname);
if (dlopen_flags)
if (dlopen_flags != 0)
(void) isc_mutex_destroy(&cd->lock);
#ifdef HAVE_DLCLOSE
if (cd->dl_handle)

5
bin/tests/db_test.c
View File

@@ -610,10 +610,11 @@ main(int argc, char *argv[]) {
} else if (strstr(s, "!V") == s) {
DBI_CHECK(dbi);
v = atoi(&s[2]);
if (v >= dbi->rcount) {
if (v >= dbi->rcount || v < 0) {
printf("unknown open version %d\n", v);
continue;
} else if (dbi->rversions[v] == NULL) {
}
if (dbi->rversions[v] == NULL) {
printf("version %d is not open\n", v);
continue;
}

8
bin/tests/shutdown_test.c
View File

@@ -174,9 +174,13 @@ main(int argc, char *argv[]) {
RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS);
if (argc > 1)
if (argc > 1) {
workers = atoi(argv[1]);
else
if (workers < 1)
workers = 1;
if (workers > 8192)
workers = 8192;
} else
workers = 2;
printf("%d workers\n", workers);

8
bin/tests/sock_test.c
View File

@@ -263,9 +263,13 @@ main(int argc, char *argv[]) {
isc_result_t result;
int pf;
if (argc > 1)
if (argc > 1) {
workers = atoi(argv[1]);
else
if (workers < 1)
workers = 1;
if (workers > 8192)
workers = 8192;
} else
workers = 2;
printf("%d workers\n", workers);

8
bin/tests/task_test.c
View File

@@ -69,9 +69,13 @@ main(int argc, char *argv[]) {
isc_timer_t *ti1, *ti2;
struct isc_interval interval;
if (argc > 1)
if (argc > 1) {
workers = atoi(argv[1]);
else
if (workers < 1)
workers = 1;
if (workers > 8192)
workers = 8192;
} else
workers = 2;
printf("%d workers\n", workers);

8
bin/tests/timer_test.c
View File

@@ -102,9 +102,13 @@ main(int argc, char *argv[]) {
isc_time_t expires, now;
isc_interval_t interval;
if (argc > 1)
if (argc > 1) {
workers = atoi(argv[1]);
else
if (workers < 1)
workers = 1;
if (workers > 8192)
workers = 8192;
} else
workers = 2;
printf("%d workers\n", workers);

10
lib/dns/client.c
View File

@@ -2018,8 +2018,9 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) {
switch (family) {
case AF_INET:
dns_rdataset_current(rdataset, &rdata);
dns_rdata_tostruct(&rdata, &rdata_a,
NULL);
result = dns_rdata_tostruct(&rdata, &rdata_a,
NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
isc_sockaddr_fromin(sa,
&rdata_a.in_addr,
53);
@@ -2027,8 +2028,9 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) {
break;
case AF_INET6:
dns_rdataset_current(rdataset, &rdata);
dns_rdata_tostruct(&rdata, &rdata_aaaa,
NULL);
result = dns_rdata_tostruct(&rdata, &rdata_aaaa,
NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
isc_sockaddr_fromin6(sa,
&rdata_aaaa.in6_addr,
53);

11
lib/irs/getaddrinfo.c
View File

@@ -784,9 +784,9 @@ process_answer(isc_task_t *task, isc_event_t *event) {
switch (family) {
case AF_INET:
dns_rdataset_current(rdataset, &rdata);
dns_rdata_tostruct(&rdata, &rdata_a,
NULL);
result = dns_rdata_tostruct(&rdata, &rdata_a,
NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
SIN(ai->ai_addr)->sin_port =
resstate->head->ai_port;
memcpy(&SIN(ai->ai_addr)->sin_addr,
@@ -795,8 +795,9 @@ process_answer(isc_task_t *task, isc_event_t *event) {
break;
case AF_INET6:
dns_rdataset_current(rdataset, &rdata);
dns_rdata_tostruct(&rdata, &rdata_aaaa,
NULL);
result = dns_rdata_tostruct(&rdata, &rdata_aaaa,
NULL);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
SIN6(ai->ai_addr)->sin6_port =
resstate->head->ai_port;
memcpy(&SIN6(ai->ai_addr)->sin6_addr,

2
lib/isc/mem.c
View File

@@ -1826,7 +1826,7 @@ isc_mem_getname(isc_mem_t *ctx0) {
REQUIRE(VALID_CONTEXT(ctx));
if (ctx->name == NULL)
if (ctx->name[0] == 0)
return ("");
return (ctx->name);

8
lib/isc/tests/socket_test.c
View File

@@ -427,6 +427,7 @@ ATF_TC_BODY(udp_dscp_v6, tc) {
completion_t completion;
isc_region_t r;
isc_socketevent_t *socketevent;
int n;
UNUSED(tc);
@@ -437,7 +438,8 @@ ATF_TC_BODY(udp_dscp_v6, tc) {
* Create two sockets: ::1/5444 and ::1/5445, talking to
* each other.
*/
inet_pton(AF_INET6, "::1", &in6.s6_addr);
n = inet_pton(AF_INET6, "::1", &in6.s6_addr);
ATF_REQUIRE(n == 1);
isc_sockaddr_fromin6(&addr1, &in6, 5444);
isc_sockaddr_fromin6(&addr2, &in6, 5445);
@@ -620,6 +622,7 @@ ATF_TC_BODY(tcp_dscp_v6, tc) {
char sendbuf[BUFSIZ], recvbuf[BUFSIZ];
completion_t completion, completion2;
isc_region_t r;
int n;
UNUSED(tc);
@@ -629,7 +632,8 @@ ATF_TC_BODY(tcp_dscp_v6, tc) {
/*
* Create two sockets: ::1/5444, talking to each other.
*/
inet_pton(AF_INET6, "::1", &in6.s6_addr);
n = inet_pton(AF_INET6, "::1", &in6.s6_addr);
ATF_REQUIRE(n == 1);
isc_sockaddr_fromin6(&addr1, &in6, 5444);
result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp,