]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Some initial fixes from coverity analysis:
authorWillem Toorop <willem@NLnetLabs.nl>
Fri, 13 Jul 2012 12:42:11 +0000 (12:42 +0000)
committerWillem Toorop <willem@NLnetLabs.nl>
Fri, 13 Jul 2012 12:42:11 +0000 (12:42 +0000)
10535 remove unused pointer in ldns-signzone.c:678
10534 remove unused pointer in drill/chasetrace.c:121
10533 remove unreachable code in drill/securetrace.c:395
10532 ldns-update only show tsig data when given in examples/ldns-update.c:312
10499 wrong sizeof argument in net.c:672
10492 replace call to random() with something better ldns-notify.c:253

drill/chasetrace.c
drill/securetrace.c
examples/ldns-notify.c
examples/ldns-signzone.c
examples/ldns-update.c
net.c

index c2bbfd009019dfce93c9810f99f6171e774bb58a..4bc779aa534e470af4f73c194d8bca5b4faff59a 100644 (file)
@@ -118,7 +118,7 @@ do_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                drill_pkt_print_footer(stdout, local_res, p);
                
                /* remove the old nameserver from the resolver */
-               while((pop = ldns_resolver_pop_nameserver(res))) { /* do it */ }
+               while(ldns_resolver_pop_nameserver(res)) { /* do it */ }
 
                /* also check for new_nss emptyness */
 
index 029ebf51d6fe5659df1c84ca325761d7da0dec49..f5416a81304d4394123ed816cb27e89b1784498e 100644 (file)
@@ -392,7 +392,6 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                                        printf(";; There is an empty non-terminal here, continue\n");
                                        continue;
                                }
-                               goto done;
                        }
 
                        if (ldns_resolver_nameserver_count(res) == 0) {
index 018a716faad414e4f7dbe9720633a2b219b62d9a..70150d598d56dae3a877238b1613df5d077156b4 100644 (file)
@@ -250,7 +250,7 @@ main(int argc, char **argv)
        ldns_pkt_set_opcode(notify, LDNS_PACKET_NOTIFY);
        ldns_pkt_push_rr(notify, LDNS_SECTION_QUESTION, question);
        ldns_pkt_set_aa(notify, true);
-       ldns_pkt_set_id(notify, random()&0xffff);
+       ldns_pkt_set_random_id(notify);
        if(include_soa) {
                char buf[10240];
                ldns_rr *soa_rr=NULL;
index 34839b053dcfb17d347b7b261edb0569797f20b6..5c9ef99b98c3e27ce6ce0024613a2a54ed1cdf43 100644 (file)
@@ -674,10 +674,6 @@ main(int argc, char *argv[])
                }
        }
 
-       if (!origin) {
-               origin = ldns_rr_owner(orig_soa);
-       }
-       
        /* read the ZSKs */
        argi = 1;
        while (argi < argc) {
index e3047dceb12894468e9833f934755ae1ea1a9a3b..f619eec410901ebc96cede7244bebda76ce46406 100644 (file)
@@ -302,8 +302,10 @@ main(int argc, char **argv)
 
        printf(";; trying UPDATE with FQDN \"%s\" and IP \"%s\"\n",
            fqdn, ipaddr ? ipaddr : "<none>");
-       printf(";; tsig: \"%s\" \"%s\" \"%s\"\n", tsig_cr.keyname,
-           tsig_cr.algorithm, tsig_cr.keydata);
+       if (argc == 6 || argc == 7) {
+               printf(";; tsig: \"%s\" \"%s\" \"%s\"\n", tsig_cr.keyname,
+                       tsig_cr.algorithm, tsig_cr.keydata);
+       }
 
        ret = ldns_update_send_simple_addr(fqdn, zone, ipaddr, port, defttl, tsig_cred);
        exit(ret);
diff --git a/net.c b/net.c
index 27debff401f028ec600535aa8082222dd91fc8de..ea34426121b23241a95f1ecca046a422f2c172e0 100644 (file)
--- a/net.c
+++ b/net.c
@@ -670,7 +670,7 @@ ldns_tcp_send(uint8_t **result,  ldns_buffer *qbin, const struct sockaddr_storag
        }
 
        /* resize accordingly */
-       *result = (uint8_t*)LDNS_XREALLOC(answer, uint8_t *, (size_t)*answer_size);
+       *result = LDNS_XREALLOC(answer, uint8_t, (size_t)*answer_size);
         if(!*result) {
                 LDNS_FREE(answer);
                 return LDNS_STATUS_MEM_ERR;