From: Willem Toorop Date: Fri, 13 Jul 2012 12:42:11 +0000 (+0000) Subject: Some initial fixes from coverity analysis: X-Git-Tag: release-1.6.14rc1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9549069fa2b5cc985127d4f532495a57ba89c7d8;p=thirdparty%2Fldns.git Some initial fixes from coverity analysis: 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 --- diff --git a/drill/chasetrace.c b/drill/chasetrace.c index c2bbfd00..4bc779aa 100644 --- a/drill/chasetrace.c +++ b/drill/chasetrace.c @@ -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 */ diff --git a/drill/securetrace.c b/drill/securetrace.c index 029ebf51..f5416a81 100644 --- a/drill/securetrace.c +++ b/drill/securetrace.c @@ -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) { diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c index 018a716f..70150d59 100644 --- a/examples/ldns-notify.c +++ b/examples/ldns-notify.c @@ -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; diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c index 34839b05..5c9ef99b 100644 --- a/examples/ldns-signzone.c +++ b/examples/ldns-signzone.c @@ -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) { diff --git a/examples/ldns-update.c b/examples/ldns-update.c index e3047dce..f619eec4 100644 --- a/examples/ldns-update.c +++ b/examples/ldns-update.c @@ -302,8 +302,10 @@ main(int argc, char **argv) printf(";; trying UPDATE with FQDN \"%s\" and IP \"%s\"\n", fqdn, ipaddr ? ipaddr : ""); - 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 27debff4..ea344261 100644 --- 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;