From: Oto Šťáva <oto.stava@nic.cz>
Date: Thu, 9 Jun 2022 06:28:02 +0000 (+0200)
Subject: renumber: fix incorrect masking of bytes after netmask boundary
X-Git-Tag: v5.5.1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d6dcaff1c90c898490fa7f4eb7636dc21589af;p=thirdparty%2Fknot-resolver.git

renumber: fix incorrect masking of bytes after netmask boundary

(we changed the original fix a bit)
---

diff --git a/modules/renumber/renumber.lua b/modules/renumber/renumber.lua
index bd5e4e9d4..2e209c165 100644
--- a/modules/renumber/renumber.lua
+++ b/modules/renumber/renumber.lua
@@ -32,7 +32,6 @@ local function mergeIps(ipNet, ipHost, intMask)
 	for currentOctetNo = 1, #ipNet do
 		if intMask >= 8 then
 			result = result .. ipNet:sub(currentOctetNo,currentOctetNo)
-			intMask = intMask - 8
 		elseif (intMask <= 0) then
 			result = result .. ipHost:sub(currentOctetNo,currentOctetNo)
 		else
@@ -42,6 +41,7 @@ local function mergeIps(ipNet, ipHost, intMask)
 					bit.band(string.byte(ipHost:sub(currentOctetNo,currentOctetNo)), bit.bnot(octetMask))
 			))
 		end
+		intMask = intMask - 8
 	end
 
 	return result