[v4_1_esv] Fixed several minor Coverity issues

        Merges in rt35144.

diff --git a/RELNOTES b/RELNOTES
index e26d1f24ea665d8d41dc813ae7dc3e5b23827c3f..e5a5b7a745ac752cc754da44d3d047cade3f5dc0 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -177,6 +177,9 @@ by Eric Young (eay@cryptsoft.com).
   Section 22.4.
   [ISC-Bugs #25687]
 
+- Corrected minor Coverity issues.
+  [ISC-Bugs #35144]
+
                        Changes since 4.1-ESV-R12b1
 
 - None

diff --git a/server/confpars.c b/server/confpars.c
index 128cf6a260be86f502dbc9b374b24075ad713909..894764e251ab9f853a77070ca1444383c48f659c 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -3,7 +3,7 @@
    Parser for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1181,17 +1181,10 @@ void parse_failover_peer (cfile, group, type)
                group->shared_network->failover_peer = peer;
 
        /* Set the initial state. */
-       if (peer -> i_am == primary) {
-               peer -> me.state = recover;
-               peer -> me.stos = cur_time;
-               peer -> partner.state = unknown_state;
-               peer -> partner.stos = cur_time;
-       } else {
-               peer -> me.state = recover;
-               peer -> me.stos = cur_time;
-               peer -> partner.state = unknown_state;
-               peer -> partner.stos = cur_time;
-       }
+       peer->me.state = recover;
+       peer->me.stos = cur_time;
+       peer->partner.state = unknown_state;
+       peer->partner.stos = cur_time;
 
        status = enter_failover_peer (peer);
        if (status != ISC_R_SUCCESS)

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 8312f054b3bb69ed26f3bfcea98ae3b5f69e1d1f..68080a4bdab9e02df4d97ee58038cb9960e4a0da 100644 (file)
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -4770,7 +4770,6 @@ iterate_over_ia_na(struct data_string *reply_ret,
        struct data_string cli_enc_opt_data;
        struct option_state *cli_enc_opt_state;
        struct host_decl *host;
-       struct option_state *host_opt_state;
        struct data_string iaaddr;
        struct data_string fixed_addr;
        char reply_data[65536];
@@ -4791,7 +4790,6 @@ iterate_over_ia_na(struct data_string *reply_ret,
        cli_enc_opt_state = NULL;
        memset(&iaaddr, 0, sizeof(iaaddr));
        memset(&fixed_addr, 0, sizeof(fixed_addr));
-       host_opt_state = NULL;
        lease = NULL;
 
        /* 
@@ -5016,9 +5014,6 @@ exit:
        if (lease != NULL) {
                iasubopt_dereference(&lease, MDL);
        }
-       if (host_opt_state != NULL) {
-               option_state_dereference(&host_opt_state, MDL);
-       }
        if (fixed_addr.buffer != NULL) {
                data_string_forget(&fixed_addr, MDL);
        }
@@ -5289,7 +5284,6 @@ iterate_over_ia_pd(struct data_string *reply_ret,
        struct data_string cli_enc_opt_data;
        struct option_state *cli_enc_opt_state;
        struct host_decl *host;
-       struct option_state *host_opt_state;
        struct data_string iaprefix;
        char reply_data[65536];
        int reply_ofs;
@@ -5307,7 +5301,6 @@ iterate_over_ia_pd(struct data_string *reply_ret,
        memset(&cli_enc_opt_data, 0, sizeof(cli_enc_opt_data));
        cli_enc_opt_state = NULL;
        memset(&iaprefix, 0, sizeof(iaprefix));
-       host_opt_state = NULL;
        prefix = NULL;
 
        /*
@@ -5499,9 +5492,6 @@ exit:
        if (prefix != NULL) {
                iasubopt_dereference(&prefix, MDL);
        }
-       if (host_opt_state != NULL) {
-               option_state_dereference(&host_opt_state, MDL);
-       }
        if (iaprefix.buffer != NULL) {
                data_string_forget(&iaprefix, MDL);
        }

diff --git a/server/failover.c b/server/failover.c
index 6605eb8180b8a0a607b2a9965923e27c2de5c5f3..d7ac4cd37fa4ac17459eebb17ecb698ebaaf6220 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -5389,8 +5389,7 @@ secondary_not_hoarding(dhcp_failover_state_t *state, struct pool *p) {
 isc_result_t dhcp_failover_process_bind_ack (dhcp_failover_state_t *state,
                                             failover_message_t *msg)
 {
-       struct lease *lt = (struct lease *)0;
-       struct lease *lease = (struct lease *)0;
+       struct lease *lease = NULL;
        struct iaddr ia;
        const char *message = "no memory";
        u_int32_t pot_expire;
@@ -5533,9 +5532,6 @@ isc_result_t dhcp_failover_process_bind_ack (dhcp_failover_state_t *state,
 
       out:
        lease_dereference (&lease, MDL);
-       if (lt)
-               lease_dereference (&lt, MDL);
-
        return ISC_R_SUCCESS;
 
       bad: