X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=b2fbe0223c6d7338600654c09750a7d2a5b9622a;hp=756633a7412c49a338b25507207a32f052dd5a36;hb=c03e20d7f594058ff223f30cf34de1b5e8210b8d;hpb=7c63f4f5a9983f9b81d90cfdf09e6fca0cfbf52d

diff --git a/utils.c b/utils.c
index 756633a..b2fbe02 100644
--- a/utils.c
+++ b/utils.c
@@ -774,6 +774,7 @@ bool
 fw3_bitlen2netmask(int family, int bits, void *mask)
 {
 	int i;
+	uint8_t rem, b;
 	struct in_addr *v4;
 	struct in6_addr *v6;
 
@@ -783,18 +784,17 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
 			return false;
 
 		v6 = mask;
-		i = abs(bits);
+		rem = abs(bits);
 
-		memset(v6->s6_addr, 0xff, i / 8);
-
-		if (i < 128)
+		for (i = 0; i < sizeof(v6->s6_addr); i++)
 		{
-			memset(v6->s6_addr + (i / 8) + 1, 0, (128 - i) / 8);
-			v6->s6_addr[i / 8] = 0xff << (8 - (i & 7));
+			b = (rem > 8) ? 8 : rem;
+			v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b));
+			rem -= b;
 		}
 
 		if (bits < 0)
-			for (i = 0; i < 16; i++)
+			for (i = 0; i < sizeof(v6->s6_addr); i++)
 				v6->s6_addr[i] = ~v6->s6_addr[i];
 	}
 	else
@@ -803,7 +803,7 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
 			return false;
 
 		v4 = mask;
-		v4->s_addr = htonl(~((1 << (32 - abs(bits))) - 1));
+		v4->s_addr = bits ? htonl(~((1 << (32 - abs(bits))) - 1)) : 0;
 
 		if (bits < 0)
 			v4->s_addr = ~v4->s_addr;