silence coverity warnings

(cherry picked from commit 45b727f651aba2cbd2f9db51ccfb4b541520a5de)
(cherry picked from commit 53f675154c93b9e8d4e96deeee6cc4669ef40582)

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index efd6572e4f7183a39d538cc3a49ddd4b1b4233a6..5529f8d5846e41616a29ec473adcc2b6d10bc8a9 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -249,7 +249,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;
@@ -353,11 +355,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)

diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index 4a98cc859776e40058b1fb543c7f8a955c5f093f..6476b840f469134f9da13f3605eee0d1afdf3ed2 100644 (file)
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -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;
                        }

diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index db0b6956da173a5201930948354e47d8721eeb0b..1f2c2464f5f0274a731aa36792eb86aabd8405a1 100644 (file)
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -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);
 

diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index 8f33a7ed494673722e220d7a6d98b3bd5413fa7b..f6d2a39222e86a344226859862b03cd57b7aeacd 100644 (file)
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -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);
 

diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index e3ff26b56c991555ee6082a882e169db6a1c323f..2e162b6d1e946ae95f96222e3cdc99d5941a192f 100644 (file)
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -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);
 

diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index 2825dc58e90283db169b528ddfe4587e0e6f67ca..cb5459ccf2102636431e0b1c3213193c1e69739b 100644 (file)
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -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);
 

diff --git a/lib/dns/client.c b/lib/dns/client.c
index bfca6c06dbc731c1d16fde88fc08cefb5fe79f31..807ccbb21f4de00fba354facc869c0f41ba96355 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -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);

diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c
index 4e86706fe593f475b4a87d0cc2443f4223b79024..fc62da12ac82ac585f41e14ff40ed865c65650a7 100644 (file)
--- a/lib/irs/getaddrinfo.c
+++ b/lib/irs/getaddrinfo.c
@@ -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,