ipaddresses : invalid netmask2cidr mask was not correctely detected
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5988 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
@@ -494,14 +494,14 @@ class ipaddresses
|
||||
if ($netmask === FALSE)
|
||||
throw new \Exception (dgettext ("domframework", "Invalid netmask"), 500);
|
||||
$netmask = decbin ($netmask);
|
||||
$netmask = sprintf ("%032s", $netmask);
|
||||
$res = -1;
|
||||
for ($i = 0 ; $i < 32 ; $i++)
|
||||
{
|
||||
if (! isset ($netmask[$i]))
|
||||
if ($res === -1 && $netmask[$i] === $maskdirect)
|
||||
{
|
||||
break;
|
||||
}
|
||||
elseif ($res == -1 && $netmask[$i] === $maskrevert)
|
||||
elseif ($res === -1 && $netmask[$i] === $maskrevert)
|
||||
{
|
||||
$res = $i;
|
||||
}
|
||||
@@ -509,6 +509,9 @@ class ipaddresses
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
}
|
||||
if ($res === -1 && $i === 32)
|
||||
return 32;
|
||||
|
||||
Reference in New Issue
Block a user