core: fix matching network addresses with bitmask non divisible to 8

- reported by Kyle Kurz <kkurz@digium.com> for permissions module (cherry picked from commit f429e75) (cherry picked from commit 05ac2a2)
kamailio · Jul 17, 2015 · f06fc52 · f06fc52
1 parent 547f148
commit f06fc52
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ip_addr.c b/ip_addr.c
@@ -356,7 +356,8 @@ char* get_proto_name(unsigned int proto)
 int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,
 		int mask)
 {
-	unsigned char c;
+	unsigned char ci;
+	unsigned char cn;
 	int i;
 	int mbytes;
 	int mbits;
@@ -399,8 +400,9 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,
 	mbits = mask % 8;
 	if(mbits==0)
 		return 0;
-	c = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));
-	if((iaddr->u.addr[i] & c) == c)
+	ci = iaddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));
+	cn = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));
+	if(ci == cn)
 		return 0;
 	return -1;
 }