ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Suppress cppcheck warnings:

Browse Source 
cppcheck-suppress objectIndex
cppcheck-suppress nullPointerRedundantCheck
This commit is contained in:
Mark Andrews
2020-06-24 14:31:00 +10:00
parent 0cf25d7f38
commit abe2c84b1d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/dnssec/dnssec-keyfromlabel.c
View File

@@ -362,6 +362,7 @@ main(int argc, char **argv) {
setup_logging(mctx, &log); setup_logging(mctx, &log);
if (predecessor == NULL) { if (predecessor == NULL) {
/* cppcheck-suppress nullPointerRedundantCheck */
if (label == NULL) { if (label == NULL) {
fatal("the key label was not specified"); fatal("the key label was not specified");
} }
@@ -383,6 +384,7 @@ main(int argc, char **argv) {
isc_result_totext(ret)); isc_result_totext(ret));
} }
/* cppcheck-suppress nullPointerRedundantCheck */
if (strchr(label, ':') == NULL) { if (strchr(label, ':') == NULL) {
char *l; char *l;
int len; int len;
@@ -394,11 +396,13 @@ main(int argc, char **argv) {
label = l; label = l;
} }
/* cppcheck-suppress nullPointerRedundantCheck */
if (algname == NULL) { if (algname == NULL) {
fatal("no algorithm specified"); fatal("no algorithm specified");
} }
r.base = algname; r.base = algname;
/* cppcheck-suppress nullPointerRedundantCheck */
r.length = strlen(algname); r.length = strlen(algname);
ret = dns_secalg_fromtext(&alg, &r); ret = dns_secalg_fromtext(&alg, &r);
if (ret != ISC_R_SUCCESS) { if (ret != ISC_R_SUCCESS) {

2
bin/dnssec/dnssec-keygen.c
View File

@@ -1180,10 +1180,12 @@ main(int argc, char **argv) {
} }
if (ctx.predecessor == NULL && ctx.policy == NULL) { if (ctx.predecessor == NULL && ctx.policy == NULL) {
/* cppcheck-suppress nullPointerRedundantCheck */
if (algname == NULL) { if (algname == NULL) {
fatal("no algorithm specified"); fatal("no algorithm specified");
} }
r.base = algname; r.base = algname;
/* cppcheck-suppress nullPointerRedundantCheck */
r.length = strlen(algname); r.length = strlen(algname);
ret = dns_secalg_fromtext(&ctx.alg, &r); ret = dns_secalg_fromtext(&ctx.alg, &r);
if (ret != ISC_R_SUCCESS) { if (ret != ISC_R_SUCCESS) {

2
lib/ns/client.c
View File

@@ -1365,7 +1365,9 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) {
if ((addrlen % 8) != 0) { if ((addrlen % 8) != 0) {
uint8_t bits = ~0U << (8 - (addrlen % 8)); uint8_t bits = ~0U << (8 - (addrlen % 8));
/* cppcheck-suppress objectIndex */
bits &= paddr[addrbytes - 1]; bits &= paddr[addrbytes - 1];
/* cppcheck-suppress objectIndex */
if (bits != paddr[addrbytes - 1]) { if (bits != paddr[addrbytes - 1]) {
return (DNS_R_OPTERR); return (DNS_R_OPTERR);
} }