From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Nov 2017 08:11:48 +0000 (+1100)
Subject: don't use the ERR macro as GCC 7 only does a partial static analysis which generates... 
X-Git-Tag: v9.12.0b2~21
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0698ad850316b243ff8ea129fce6a0ee24582ed0;p=thirdparty%2Fbind9.git

don't use the ERR macro as GCC 7 only does a partial static analysis which generates false positives for fallthrough. [RT #46115]
---

diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index c5f987dd756..6e26e278fd8 100644
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -319,8 +319,13 @@ getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
 		case DNS_R_NOVALIDKEY:
 		case DNS_R_NOVALIDDS:
 		case DNS_R_NOVALIDSIG:
-			ERR(EAI_INSECUREDATA);
-			/* NOTREACHED */
+			/*
+			 * Don't use ERR as GCC 7 wants to raise a
+			 * warning with ERR about possible falling
+			 * through which is impossible.
+			 */
+			result = EAI_INSECUREDATA;
+			goto cleanup;
 		default:
 			ERR(EAI_FAIL);
 		}