upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 04:12:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '498-clang-scan-build-detected-errors' into 'master'

Browse source 
Resolve "clang scan-build detected errors"

Closes #498

See merge request isc-projects/bind9!703
This commit is contained in:
Stephen Morris 2018-08-27 10:25:22 -04:00
commit 760182271e
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/rdataset.c
View file

@ -312,8 +312,7 @@ towire_compare(const void *av, const void *bv) {
static inline void
swap_rdata(dns_rdata_t *in, unsigned int a, unsigned int b) {
dns_rdata_t rdata = DNS_RDATA_INIT;
rdata = in[a];
dns_rdata_t rdata = in[a];
in[a] = in[b];
in[b] = rdata;
}
@ -403,7 +402,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
if ((shuffle || sort)) {
uint32_t seed = 0;
unsigned int j;
unsigned int j = 0;
/*
* First we get handles to all of the rdata.
@ -423,15 +422,12 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
if (ISC_LIKELY(want_random)) {
seed = isc_random32();
j = 0;
}
if (ISC_UNLIKELY(want_cyclic) &&
(rdataset->count != DNS_RDATASET_COUNT_UNDEFINED))
{
j = rdataset->count % count;
} else { /* Otherwise, just start from beginning */
j = 0;
}
for (i = 0; i < count; i++) {

8
lib/dns/zoneverify.c
View file

@ -746,7 +746,7 @@ verifynsec3(const vctx_t *vctx, const dns_name_t *name,
dns_rdata_nsec3param_t nsec3param;
dns_fixedname_t fixed;
dns_name_t *hashname;
isc_result_t result, tvresult;
isc_result_t result, tvresult = ISC_R_UNSET;
dns_dbnode_t *node = NULL;
unsigned char rawhash[NSEC3_MAX_HASH_LENGTH];
size_t rhsize = sizeof(rawhash);
@ -975,7 +975,7 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node,
unsigned char types[8192];
unsigned int maxtype = 0;
dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsiter = NULL;
isc_result_t result, tvresult;
isc_result_t result, tvresult = ISC_R_UNSET;
REQUIRE(vresult != NULL || (nsecset == NULL && nsec3paramset == NULL));
@ -1298,7 +1298,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name,
int order;
unsigned int labels, nlabels, i;
dns_name_t suffix;
isc_result_t result, tvresult;
isc_result_t result, tvresult = ISC_R_UNSET;
*vresult = ISC_R_SUCCESS;
@ -1744,7 +1744,7 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) {
dns_dbnode_t *node = NULL, *nextnode;
dns_dbiterator_t *dbiter = NULL;
bool done = false;
isc_result_t tvresult;
isc_result_t tvresult = ISC_R_UNSET;
isc_result_t result;
name = dns_fixedname_initname(&fname);

7
lib/isc/pk11.c
View file

@ -445,10 +445,11 @@ token_login(pk11_session_t *sp) {
(CK_UTF8CHAR_PTR) token->pin,
(CK_ULONG) strlen(token->pin));
if (rv != CKR_OK) {
ret = ISC_R_NOPERM;
#if PK11_NO_LOGERR
pk11_error_fatalcheck(__FILE__, __LINE__,
"pkcs_C_Login", rv);
#else
ret = ISC_R_NOPERM;
#endif
} else
token->logged = true;
@ -766,14 +767,13 @@ pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) {
static char *
percent_decode(char *x, size_t *len) {
char *p, *c;
unsigned char v;
unsigned char v = 0;
INSIST(len != NULL);
for (p = c = x; p[0] != '\0'; p++, c++) {
switch (p[0]) {
case '%':
v = 0;
switch (p[1]) {
case '0':
case '1':
@ -1112,7 +1112,6 @@ pk11_dump_tokens(void) {
if (token->operations & (1 << OP_ECDSA)) {
if (!first)
printf(",");
first = false;
printf("EC");
}
printf(")\n");