From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 22 Aug 2017 15:04:22 +0000 (+0200)
Subject: fallthrough fixes
X-Git-Tag: release-1.7.1-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da0da99794ec1b7039dee0672cfba70dd7485f90;p=thirdparty%2Fldns.git

fallthrough fixes
---

diff --git a/dnssec_verify.c b/dnssec_verify.c
index b69939fb..a6b98504 100644
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -2615,6 +2615,8 @@ ldns_verify_rrsig_evp_raw(const unsigned char *sig, size_t siglen,
 				ldns_buffer_position(rrset));
 		}
 	} else
+#else
+	res = 0;
 #endif
 	if(digest_type) {
 		EVP_VerifyInit(ctx, digest_type);
@@ -2628,6 +2630,7 @@ ldns_verify_rrsig_evp_raw(const unsigned char *sig, size_t siglen,
 	
 	if (res == 1) {
 		return LDNS_STATUS_OK;
+
 	} else if (res == 0) {
 		return LDNS_STATUS_CRYPTO_BOGUS;
 	}
diff --git a/packet.c b/packet.c
index 3a8488d8..774cb176 100644
--- a/packet.c
+++ b/packet.c
@@ -389,6 +389,7 @@ ldns_pkt_rr(const ldns_pkt *pkt, ldns_pkt_section sec, const ldns_rr *rr)
 		return ldns_rr_list_contains_rr(ldns_pkt_additional(pkt), rr);
 	case LDNS_SECTION_ANY:
 		result = ldns_rr_list_contains_rr(ldns_pkt_question(pkt), rr);
+		/* fallthrough */
 	case LDNS_SECTION_ANY_NOQUESTION:
 		result = result
 		    || ldns_rr_list_contains_rr(ldns_pkt_answer(pkt), rr)
diff --git a/rr.c b/rr.c
index c971610e..dc27dd31 100644
--- a/rr.c
+++ b/rr.c
@@ -351,6 +351,7 @@ ldns_rr_new_frm_str_internal(ldns_rr **newrr, const char *str,
 							delimiters = "\n";
 							break;
 						}
+						/* fallthrough */
 		default                       :	delimiters = "\n\t "; 
 		}
 
diff --git a/util.c b/util.c
index 3dcd8495..1216134f 100644
--- a/util.c
+++ b/util.c
@@ -548,10 +548,12 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 
 		/* ........ ........ ....4444 4....... ........ */
 		         c =  src[3]         >> 7 ;
+		/* fallthrough */
 	case 3: dst[4] = b32[(src[2] & 0x0f) << 1 | c];
 
 		/* ........ .......3 3333.... ........ ........ */
 			 c =  src[2]         >> 4 ;
+		/* fallthrough */
 	case 2:	dst[3] = b32[(src[1] & 0x01) << 4 | c];
 
 		/* ........ ..22222. ........ ........ ........ */
@@ -559,6 +561,7 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 
 		/* .....111 11...... ........ ........ ........ */
 	                 c =  src[1]         >> 6 ;
+		/* fallthrough */
 	case 1:	dst[1] = b32[(src[0] & 0x07) << 2 | c];
 
 		/* 00000... ........ ........ ........ ........ */
@@ -569,9 +572,12 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 		switch (src_sz) {
 			case 1: dst[2] = '=';
 				dst[3] = '=';
+				/* fallthrough */
 			case 2: dst[4] = '=';
+				/* fallthrough */
 			case 3: dst[5] = '=';
 				dst[6] = '=';
+				/* fallthrough */
 			case 4: dst[7] = '=';
 		}
 	}
@@ -696,15 +702,18 @@ ldns_b32_pton_base(const char* src, size_t src_sz,
 			/* ........ ........ ........ .55555.. ........ */
 			/* ........ ........ ....4444 4....... ........ */
 			dst[3] = buf[4] << 7 | buf[5] << 2 | buf[6] >> 3;
+			/* fallthrough */
 
 		case 5: /* ........ ........ ....4444 4....... ........ */
 			/* ........ .......3 3333.... ........ ........ */
 			dst[2] = buf[3] << 4 | buf[4] >> 1;
+			/* fallthrough */
 
 		case 4: /* ........ .......3 3333.... ........ ........ */
 			/* ........ ..22222. ........ ........ ........ */
 			/* .....111 11...... ........ ........ ........ */
 			dst[1] = buf[1] << 6 | buf[2] << 1 | buf[3] >> 4;
+			/* fallthrough */
 
 		case 2: /* .....111 11...... ........ ........ ........ */
 			/* 00000... ........ ........ ........ ........ */