Silence cppcheck possible NULL pointer dereference

Use isc_region_t instead of isc_textregion_t as ccpcheck marked tr.base as not initalised.
Suppress cppcheck warning
2021-11-01 17:44:23 +11:00 · 2021-11-01 17:42:37 +11:00 · 2021-11-01 17:42:37 +11:00 · 2021-11-01 17:42:37 +11:00 · 2021-11-01 17:42:37 +11:00 · 2021-11-01 17:42:37 +11:00
88 changed files with 138 additions and 123 deletions
@@ -376,7 +376,7 @@ rndc_recvdone(isc_nmhandle_t *handle, isc_result_t result, void *arg) {

 		result = isccc_cc_lookupuint32(data, "result", &eresult);
 		if (result == ISC_R_SUCCESS) {
-			printf("%s %u\n", isc_result_toid(eresult), eresult);
+			printf("%s %d\n", isc_result_toid(eresult), eresult);
 		} else {
 			printf("NONE -1\n");
 		}
@@ -249,7 +249,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 		name = dns_fixedname_initname(&fname);
 		result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
 		if (result != ISC_R_SUCCESS) {
-			fprintf(stderr, "failed to convert qname: %u\n",
+			fprintf(stderr, "failed to convert qname: %d\n",
 				result);
 			exit(1);
 		}
@@ -258,7 +258,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 	result = dns_client_setservers(client, dns_rdataclass_in, name,
 				       &servers);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "set server failed: %u\n", result);
+		fprintf(stderr, "set server failed: %d\n", result);
 		exit(1);
 	}
 }
@@ -397,7 +397,7 @@ main(int argc, char *argv[]) {

 	result = dst_lib_init(ctxs_mctx, NULL);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dst_lib_init failed: %u\n", result);
+		fprintf(stderr, "dst_lib_init failed: %d\n", result);
 		exit(1);
 	}

@@ -406,7 +406,7 @@ main(int argc, char *argv[]) {
 				   ctxs_netmgr, ctxs_timermgr, clientopt,
 				   &client, addr4, addr6);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_create failed: %u, %s\n", result,
+		fprintf(stderr, "dns_client_create failed: %d, %s\n", result,
 			isc_result_totext(result));
 		exit(1);
 	}
@@ -419,7 +419,7 @@ main(int argc, char *argv[]) {
 		result = irs_resconf_load(ctxs_mctx, "/etc/resolv.conf",
 					  &resconf);
 		if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
-			fprintf(stderr, "irs_resconf_load failed: %u\n",
+			fprintf(stderr, "irs_resconf_load failed: %d\n",
 				result);
 			exit(1);
 		}
@@ -428,7 +428,7 @@ main(int argc, char *argv[]) {
 					       nameservers);
 		if (result != ISC_R_SUCCESS) {
 			irs_resconf_destroy(&resconf);
-			fprintf(stderr, "dns_client_setservers failed: %u\n",
+			fprintf(stderr, "dns_client_setservers failed: %d\n",
 				result);
 			exit(1);
 		}
@@ -459,7 +459,7 @@ main(int argc, char *argv[]) {
 	qname = dns_fixedname_initname(&qname0);
 	result = dns_name_fromtext(qname, &b, dns_rootname, 0, NULL);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "failed to convert qname: %u\n", result);
+		fprintf(stderr, "failed to convert qname: %d\n", result);
 	}

 	/* Perform resolution */
@@ -525,11 +525,11 @@ static isc_result_t
 journal_write_xhdr(dns_journal_t *j, uint32_t size, uint32_t count,
 		   uint32_t serial0, uint32_t serial1) {
 	if (j->header_ver1) {
-		journal_rawxhdr_ver1_t raw;
-		encode_uint32(size, raw.size);
-		encode_uint32(serial0, raw.serial0);
-		encode_uint32(serial1, raw.serial1);
-		return (journal_write(j, &raw, sizeof(raw)));
+		journal_rawxhdr_ver1_t raw_ver1;
+		encode_uint32(size, raw_ver1.size);
+		encode_uint32(serial0, raw_ver1.serial0);
+		encode_uint32(serial1, raw_ver1.serial1);
+		return (journal_write(j, &raw_ver1, sizeof(raw_ver1)));
 	} else {
 		journal_rawxhdr_t raw;
 		encode_uint32(size, raw.size);
@@ -2315,7 +2315,7 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) {

 	isc_buffer_usedregion(&buffer, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 bool
@@ -1051,9 +1051,9 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname,
 						return (result);
 					}

-					result = (callback)(current,
-							    callback_name,
-							    callback_arg);
+					result = (*callback)(current,
+							     callback_name,
+							     callback_arg);
 					if (result != DNS_R_CONTINUE) {
 						saved_result = result;
 						/*
@@ -2215,6 +2215,8 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) {
 				}
 			}

+			/* cppcheck-suppress nullPointerRedundantCheck
+			 * symbolName=child */
 			parent = PARENT(child);
 		}

@@ -1309,7 +1309,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {

 	if (use_default) {
 		dns_rdata_toregion(rdata, &r);
-		result = (digest)(arg, &r);
+		result = (*digest)(arg, &r);
 	}

 	return (result);
@@ -1890,9 +1890,9 @@ inet_totext(int af, uint32_t flags, isc_region_t *src, isc_buffer_t *target) {
 	 * parsing, so append 0 in that case.
 	 */
 	if (af == AF_INET6 && (flags & DNS_STYLEFLAG_YAML) != 0) {
-		isc_textregion_t tr;
-		isc_buffer_usedregion(target, (isc_region_t *)&tr);
-		if (tr.base[tr.length - 1] == ':') {
+		isc_region_t r;
+		isc_buffer_usedregion(target, &r);
+		if (r.length > 0U && r.base[r.length - 1] == ':') {
 			if (isc_buffer_availablelength(target) == 0) {
 				return (ISC_R_NOSPACE);
 			}
@@ -281,7 +281,7 @@ digest_ch_a(ARGS_DIGEST) {
 	dns_name_fromregion(&name, &r);
 	isc_region_consume(&r, name_length(&name));
 	RETERR(dns_name_digest(&name, digest, arg));
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -254,7 +254,7 @@ additionaldata_afsdb(ARGS_ADDLDATA) {
 	isc_region_consume(&region, 2);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -268,7 +268,7 @@ digest_afsdb(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 2);
 	r1.length = 2;
-	RETERR((digest)(arg, &r1));
+	RETERR((*digest)(arg, &r1));
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r2);

@@ -409,7 +409,7 @@ digest_amtrelay(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_amtrelay);

 	dns_rdata_toregion(rdata, &region);
-	return ((digest)(arg, &region));
+	return ((*digest)(arg, &region));
 }

 static inline bool
@@ -110,7 +110,7 @@ digest_avc(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -589,7 +589,7 @@ digest_caa(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -124,7 +124,7 @@ digest_cdnskey(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -131,7 +131,7 @@ digest_cds(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -250,7 +250,7 @@ digest_cert(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -228,7 +228,7 @@ digest_csync(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_csync);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -127,7 +127,7 @@ digest_dlv(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -125,7 +125,7 @@ digest_dnskey(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -326,7 +326,7 @@ digest_doa(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -350,7 +350,7 @@ digest_ds(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -175,7 +175,7 @@ digest_eui48(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -178,7 +178,7 @@ digest_eui64(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -220,7 +220,7 @@ digest_gpos(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -184,7 +184,7 @@ digest_hinfo(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -395,7 +395,7 @@ digest_hip(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_hip);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -454,7 +454,7 @@ digest_ipseckey(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_ipseckey);

 	dns_rdata_toregion(rdata, &region);
-	return ((digest)(arg, &region));
+	return ((*digest)(arg, &region));
 }

 static inline bool
@@ -211,7 +211,7 @@ digest_isdn(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -431,7 +431,7 @@ digest_key(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -427,7 +427,7 @@ digest_keydata(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -194,7 +194,7 @@ digest_l32(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -188,7 +188,7 @@ digest_l64(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -800,7 +800,7 @@ digest_loc(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -200,11 +200,11 @@ additionaldata_lp(ARGS_ADDLDATA) {
 	isc_region_consume(&region, 2);
 	dns_name_fromregion(&name, &region);

-	result = (add)(arg, &name, dns_rdatatype_l32, NULL);
+	result = (*add)(arg, &name, dns_rdatatype_l32, NULL);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
-	return ((add)(arg, &name, dns_rdatatype_l64, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_l64, NULL));
 }

 static inline isc_result_t
@@ -214,7 +214,7 @@ digest_lp(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_lp);

 	dns_rdata_toregion(rdata, &region);
-	return ((digest)(arg, &region));
+	return ((*digest)(arg, &region));
 }

 static inline bool
@@ -185,7 +185,7 @@ additionaldata_mb(ARGS_ADDLDATA) {
 	dns_rdata_toregion(rdata, &region);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -186,7 +186,7 @@ additionaldata_md(ARGS_ADDLDATA) {
 	dns_rdata_toregion(rdata, &region);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -185,7 +185,7 @@ additionaldata_mf(ARGS_ADDLDATA) {
 	dns_rdata_toregion(rdata, &region);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -284,7 +284,7 @@ additionaldata_mx(ARGS_ADDLDATA) {
 		return (ISC_R_SUCCESS);
 	}

-	result = (add)(arg, &name, dns_rdatatype_a, NULL);
+	result = (*add)(arg, &name, dns_rdatatype_a, NULL);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -296,8 +296,8 @@ additionaldata_mx(ARGS_ADDLDATA) {
 		return (ISC_R_SUCCESS);
 	}

-	return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
-		      NULL));
+	return ((*add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
+		       NULL));
 }

 static inline isc_result_t
@@ -311,7 +311,7 @@ digest_mx(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 2);
 	r1.length = 2;
-	RETERR((digest)(arg, &r1));
+	RETERR((*digest)(arg, &r1));
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r2);
 	return (dns_name_digest(&name, digest, arg));
@@ -640,7 +640,7 @@ additionaldata_naptr(ARGS_ADDLDATA) {
 	dns_name_fromregion(&name, &sr);

 	if (atype != 0) {
-		return ((add)(arg, &name, atype, NULL));
+		return ((*add)(arg, &name, atype, NULL));
 	}

 	return (ISC_R_SUCCESS);
@@ -690,7 +690,7 @@ digest_naptr(ARGS_DIGEST) {
 	 * Digest the RR up to the replacement name.
 	 */
 	r1.length = length;
-	result = (digest)(arg, &r1);
+	result = (*digest)(arg, &r1);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -188,7 +188,7 @@ digest_nid(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -110,7 +110,7 @@ digest_ninfo(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -196,7 +196,7 @@ additionaldata_ns(ARGS_ADDLDATA) {
 	dns_rdata_toregion(rdata, &region);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -376,7 +376,7 @@ digest_nsec3(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_nsec3);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -286,7 +286,7 @@ digest_nsec3param(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_nsec3param);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -227,7 +227,7 @@ digest_nsec(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_nsec);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -151,7 +151,7 @@ digest_null(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -316,7 +316,7 @@ digest_nxt(ARGS_DIGEST) {
 	}
 	isc_region_consume(&r, name_length(&name));

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -202,7 +202,7 @@ digest_openpgpkey(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -118,7 +118,7 @@ static inline isc_result_t digest_ #(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool checkowner_ #(ARGS_CHECKOWNER) {
@@ -121,7 +121,7 @@ digest_rkey(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -248,15 +248,15 @@ additionaldata_rt(ARGS_ADDLDATA) {
 	isc_region_consume(&region, 2);
 	dns_name_fromregion(&name, &region);

-	result = (add)(arg, &name, dns_rdatatype_x25, NULL);
+	result = (*add)(arg, &name, dns_rdatatype_x25, NULL);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
-	result = (add)(arg, &name, dns_rdatatype_isdn, NULL);
+	result = (*add)(arg, &name, dns_rdatatype_isdn, NULL);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -271,7 +271,7 @@ digest_rt(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 2);
 	r1.length = 2;
-	result = (digest)(arg, &r1);
+	result = (*digest)(arg, &r1);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -257,7 +257,7 @@ digest_sink(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -117,7 +117,7 @@ digest_smimea(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -389,7 +389,7 @@ digest_soa(ARGS_DIGEST) {
 	RETERR(dns_name_digest(&name, digest, arg));
 	isc_region_consume(&r, name_length(&name));

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -111,7 +111,7 @@ digest_spf(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -261,7 +261,7 @@ digest_sshfp(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -127,7 +127,7 @@ digest_ta(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -223,7 +223,7 @@ digest_talink(ARGS_DIGEST) {
 	REQUIRE(rdata->type == dns_rdatatype_talink);

 	dns_rdata_toregion(rdata, &r);
-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -304,7 +304,7 @@ digest_tlsa(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -246,7 +246,7 @@ digest_txt(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -283,7 +283,7 @@ digest_uri(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -197,7 +197,7 @@ digest_x25(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -315,7 +315,7 @@ digest_zonemd(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -197,7 +197,7 @@ digest_hs_a(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -424,7 +424,7 @@ digest_in_a6(ARGS_DIGEST) {
 	octets = 1 + 16 - prefixlen / 8;

 	r1.length = octets;
-	result = (digest)(arg, &r1);
+	result = (*digest)(arg, &r1);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -202,7 +202,7 @@ digest_in_a(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -214,7 +214,7 @@ digest_in_aaaa(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -445,7 +445,7 @@ digest_in_apl(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -280,7 +280,7 @@ digest_in_atma(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -198,7 +198,7 @@ digest_in_dhcid(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -187,7 +187,7 @@ digest_in_eid(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -123,7 +123,7 @@ digest_in_https(ARGS_DIGEST) {
 	REQUIRE(rdata->rdclass == dns_rdataclass_in);

 	dns_rdata_toregion(rdata, &region1);
-	return ((digest)(arg, &region1));
+	return ((*digest)(arg, &region1));
 }

 static inline bool
@@ -235,7 +235,7 @@ additionaldata_in_kx(ARGS_ADDLDATA) {
 	isc_region_consume(&region, 2);
 	dns_name_fromregion(&name, &region);

-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -250,7 +250,7 @@ digest_in_kx(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 2);
 	r1.length = 2;
-	RETERR((digest)(arg, &r1));
+	RETERR((*digest)(arg, &r1));
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r2);
 	return (dns_name_digest(&name, digest, arg));
@@ -187,7 +187,7 @@ digest_in_nimloc(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -222,7 +222,7 @@ digest_in_nsap(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -320,7 +320,7 @@ digest_in_px(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 2);
 	r1.length = 2;
-	result = (digest)(arg, &r1);
+	result = (*digest)(arg, &r1);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -326,7 +326,7 @@ additionaldata_in_srv(ARGS_ADDLDATA) {
 		return (ISC_R_SUCCESS);
 	}

-	result = (add)(arg, &name, dns_rdatatype_a, NULL);
+	result = (*add)(arg, &name, dns_rdatatype_a, NULL);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
@@ -345,8 +345,8 @@ additionaldata_in_srv(ARGS_ADDLDATA) {
 		return (ISC_R_SUCCESS);
 	}

-	return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
-		      NULL));
+	return ((*add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa,
+		       NULL));
 }

 static inline isc_result_t
@@ -361,7 +361,7 @@ digest_in_srv(ARGS_DIGEST) {
 	r2 = r1;
 	isc_region_consume(&r2, 6);
 	r1.length = 6;
-	RETERR((digest)(arg, &r1));
+	RETERR((*digest)(arg, &r1));
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r2);
 	return (dns_name_digest(&name, digest, arg));
@@ -1095,7 +1095,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
 			return (ISC_R_SUCCESS);
 		}
 		/* Only lookup address records */
-		return ((add)(arg, owner, dns_rdatatype_a, NULL));
+		return ((*add)(arg, owner, dns_rdatatype_a, NULL));
 	}

 	/*
@@ -1104,7 +1104,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
 	dns_rdataset_init(&rdataset);
 	fname = dns_fixedname_initname(&fixed);
 	do {
-		RETERR((add)(arg, &name, dns_rdatatype_cname, &rdataset));
+		RETERR((*add)(arg, &name, dns_rdatatype_cname, &rdataset));
 		if (dns_rdataset_isassociated(&rdataset)) {
 			isc_result_t result;
 			result = dns_rdataset_first(&rdataset);
@@ -1138,7 +1138,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
 	 * Look up HTTPS/SVCB records when processing the alias form.
 	 */
 	if (alias) {
-		RETERR((add)(arg, &name, rdata->type, &rdataset));
+		RETERR((*add)(arg, &name, rdata->type, &rdataset));
 		/*
 		 * Don't return A or AAAA if this is not the last element
 		 * in the HTTP / SVCB chain.
@@ -1148,7 +1148,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
 			return (ISC_R_SUCCESS);
 		}
 	}
-	return ((add)(arg, &name, dns_rdatatype_a, NULL));
+	return ((*add)(arg, &name, dns_rdatatype_a, NULL));
 }

 static inline isc_result_t
@@ -1167,7 +1167,7 @@ digest_in_svcb(ARGS_DIGEST) {
 	REQUIRE(rdata->rdclass == dns_rdataclass_in);

 	dns_rdata_toregion(rdata, &region1);
-	return ((digest)(arg, &region1));
+	return ((*digest)(arg, &region1));
 }

 static inline bool
@@ -380,7 +380,7 @@ digest_in_wks(ARGS_DIGEST) {

 	dns_rdata_toregion(rdata, &r);

-	return ((digest)(arg, &r));
+	return ((*digest)(arg, &r));
 }

 static inline bool
@@ -172,7 +172,6 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 		goto free_rdatas;
 	}
 	for (i = 0; i < nalloc && result == ISC_R_SUCCESS; i++) {
-		INSIST(result == ISC_R_SUCCESS);
 		dns_rdata_init(&x[i].rdata);
 		dns_rdataset_current(rdataset, &x[i].rdata);
 		INSIST(x[i].rdata.data != &removed);
@@ -2999,7 +2999,8 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
 	 */
 	if (!dns_name_issubdomain(name, &zone->origin)) {
 		if (zone->checkns != NULL) {
-			return ((zone->checkns)(zone, name, owner, NULL, NULL));
+			return ((*zone->checkns)(zone, name, owner, NULL,
+						 NULL));
 		}
 		return (true);
 	}
@@ -548,7 +548,7 @@ dns_zt_apply(dns_zt_t *zt, bool stop, isc_result_t *sub,
 		if (result == ISC_R_SUCCESS) {
 			zone = node->data;
 			if (zone != NULL) {
-				result = (action)(zone, uap);
+				result = (*action)(zone, uap);
 			}
 			if (result != ISC_R_SUCCESS && stop) {
 				tresult = result;
@@ -32,6 +32,8 @@ static isc_mem_t *mctx = NULL;

 static void
 setup_test(void) {
+	int n;
+
 	isc_mem_create(&mctx);

 	/*
@@ -39,7 +41,8 @@ setup_test(void) {
 	 * that access test data files must first chdir to the proper
 	 * location.
 	 */
-	assert_return_code(chdir(TESTS_DIR), 0);
+	n = chdir(TESTS_DIR);
+	assert_return_code(n, 0);
 }

 static isc_result_t
@@ -278,6 +278,6 @@ isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap) {
 	REQUIRE(action != NULL);

 	for (i = 1; i <= heap->last; i++) {
-		(action)(heap->array[i], uap);
+		(*action)(heap->array[i], uap);
 	}
 }
@@ -210,11 +210,11 @@ isc_task_create_bound(isc_taskmgr_t *manager, unsigned int quantum,
 	REQUIRE(VALID_MANAGER(manager));
 	REQUIRE(taskp != NULL && *taskp == NULL);

-	XTRACE("isc_task_create");
-
 	task = isc_mem_get(manager->mctx, sizeof(*task));
 	*task = (isc_task_t){ 0 };

+	XTRACE("isc_task_create");
+
 	isc_taskmgr_attach(manager, &task->manager);

 	if (threadid == -1) {
@@ -54,10 +54,12 @@ static void
 isc_file_sanitize_test(void **state) {
 	isc_result_t result;
 	char buf[1024];
+	int n;

 	UNUSED(state);

-	assert_return_code(chdir(TESTS_DIR), 0);
+	n = chdir(TESTS_DIR);
+	assert_return_code(n, 0);

 	result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
 	assert_int_equal(result, ISC_R_SUCCESS);
@@ -90,10 +92,12 @@ static void
 isc_file_template_test(void **state) {
 	isc_result_t result;
 	char buf[1024];
+	int n;

 	UNUSED(state);

-	assert_return_code(chdir(TESTS_DIR), 0);
+	n = chdir(TESTS_DIR);
+	assert_return_code(n, 0);

 	result = isc_file_template("/absolute/path", "file-XXXXXXXX", buf,
 				   sizeof(buf));
@@ -86,6 +86,8 @@ static void
 isc_hmac_test(isc_hmac_t *hmac, const void *key, size_t keylen,
 	      const isc_md_type_t *type, const char *buf, size_t buflen,
 	      const char *result, const int repeats) {
+	isc_result_t result;
+
 	assert_non_null(hmac);
 	assert_int_equal(isc_hmac_init(hmac, key, keylen, type), ISC_R_SUCCESS);

@@ -108,7 +110,8 @@ isc_hmac_test(isc_hmac_t *hmac, const void *key, size_t keylen,
 	isc_buffer_t b;
 	isc_buffer_init(&b, hexdigest, sizeof(hexdigest));

-	assert_return_code(isc_hex_totext(&r, 0, "", &b), ISC_R_SUCCESS);
+	result = isc_hex_totext(&r, 0, "", &b);
+	assert_return_code(result, ISC_R_SUCCESS);

 	assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0));
 	assert_int_equal(isc_hmac_reset(hmac), ISC_R_SUCCESS);
@@ -84,6 +84,8 @@ isc_md_free_test(void **state) {
 static void
 isc_md_test(isc_md_t *md, const isc_md_type_t *type, const char *buf,
 	    size_t buflen, const char *result, const int repeats) {
+	isc_result_t result;
+
 	assert_non_null(md);
 	assert_int_equal(isc_md_init(md, type), ISC_R_SUCCESS);

@@ -104,7 +106,8 @@ isc_md_test(isc_md_t *md, const isc_md_type_t *type, const char *buf,
 	isc_buffer_t b;
 	isc_buffer_init(&b, hexdigest, sizeof(hexdigest));

-	assert_return_code(isc_hex_totext(&r, 0, "", &b), ISC_R_SUCCESS);
+	result = isc_hex_totext(&r, 0, "", &b),
+	assert_return_code(result, ISC_R_SUCCESS);

 	assert_memory_equal(hexdigest, result, (result ? strlen(result) : 0));
 	assert_int_equal(isc_md_reset(md), ISC_R_SUCCESS);
@@ -181,7 +181,7 @@ static void
 subthread_assert_result_equal(isc_result_t result, isc_result_t expected,
 			      const char *file, unsigned int line) {
 	if (result != expected) {
-		printf("# %s:%u subthread_assert_result_equal(%u != %u)\n",
+		printf("# %s:%u subthread_assert_result_equal(%d != %d)\n",
 		       file, line, result, expected);
 		set_global_error(result);
 	}
@@ -277,7 +277,7 @@ isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action,
 		for (elt = ISC_LIST_HEAD(symtab->table[i]); elt != NULL;
 		     elt = nelt) {
 			nelt = ISC_LIST_NEXT(elt, link);
-			if ((action)(elt->key, elt->type, elt->value, arg)) {
+			if ((*action)(elt->key, elt->type, elt->value, arg)) {
 				free_elt(symtab, i, elt);
 			}
 		}
Author	SHA1	Message	Date
Mark Andrews	7f09b06615	Silence cppcheck possible NULL pointer dereference Use isc_region_t instead of isc_textregion_t as ccpcheck marked tr.base as not initalised.	2021-11-01 17:44:23 +11:00
Mark Andrews	6b27cee146	Suppress cppcheck warning Warning "Either the condition '(child)==((void*)0)' is redundant or there is possible null pointer dereference: child." Add "cppcheck-suppress nullPointerRedundantCheck symbolName=child"	2021-11-01 17:42:37 +11:00
Mark Andrews	2f22cb657a	Silence cppcheck reports of function call in sizeof() cmocka macros call sizeof() on arguments that are function calls reimplement to remove warning	2021-11-01 17:42:37 +11:00
Mark Andrews	6787cad9eb	Deconfuse cppcheck	2021-11-01 17:42:37 +11:00
Mark Andrews	f2d9ea0865	Remove dead code INSIST() is redundent as it is a condition of entry to loop.	2021-11-01 17:42:37 +11:00
Mark Andrews	ff47c966f4	Address cppcheck reports regarding function pointer cppcheck reports local address being returned with function pointers that are not deferrenced e.g. int function(int (action)(int )) { int local = 0; return ((action)(&local)); } replace with return ((*action)(&local));	2021-11-01 17:42:37 +11:00
Mark Andrews	de223c9c6a	isc_result_t is now an enum which are signed, adjust format strings	2021-11-01 17:42:37 +11:00
Mark Andrews	f80a474e59	'task' is reported when uninitalised move XTRACE to after 'task' is created so that 'task' is valid	2021-11-01 17:42:37 +11:00