From: Mark Andrews <marka@isc.org>
Date: Thu, 13 Aug 2020 02:08:50 +0000 (+1000)
Subject: NXT: fix fromwire bitmap checks
X-Git-Tag: v9.17.5~50^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73dd8496558beea6f6097788e4c7c8ccb45d8c1a;p=thirdparty%2Fbind9.git

NXT: fix fromwire bitmap checks
---

diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 9d39f22d21a..2655861a926 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -148,8 +148,8 @@ fromwire_nxt(ARGS_FROMWIRE) {
 	RETERR(dns_name_fromwire(&name, source, dctx, options, target));
 
 	isc_buffer_activeregion(source, &sr);
-	if (sr.length > 0 && (sr.base[0] & 0x80) == 0 &&
-	    ((sr.length > 16) || sr.base[sr.length - 1] == 0))
+	if (sr.length > 0 && ((sr.base[0] & 0x80) != 0 || sr.length > 16 ||
+			      sr.base[sr.length - 1] == 0))
 	{
 		return (DNS_R_BADBITMAP);
 	}