d1b3699800
Following bad addresses are being validated as good by checkIPv6() 1:2:3:4:5:6:7:8:1.2.3.4 ::1:2:3:4:5:6:7:8 1:2:3:4:5:6:7:8:: 1:2:3:4:5:6:::8 ::::a :::: 1::2::3 Obtained from: pfSense MFH: 2016Q3 Sponsored by: Rubicon Communications (Netgate)
35 lines
1,020 B
PHP
35 lines
1,020 B
PHP
--- Net/IPv6.php.orig 2016-08-31 14:11:53 UTC
|
|
+++ Net/IPv6.php
|
|
@@ -550,7 +550,7 @@ class Net_IPv6
|
|
|
|
if (false !== strpos($uip, '::') ) {
|
|
|
|
- list($ip1, $ip2) = explode('::', $uip);
|
|
+ list($ip1, $ip2) = explode('::', $uip, 2);
|
|
|
|
if ("" == $ip1) {
|
|
|
|
@@ -601,12 +601,12 @@ class Net_IPv6
|
|
|
|
} else if (-1 == $c1) { // ::xxx
|
|
|
|
- $fill = str_repeat('0:', 7-$c2);
|
|
+ $fill = str_repeat('0:', max(1, 7-$c2));
|
|
$uip = str_replace('::', $fill, $uip);
|
|
|
|
} else if (-1 == $c2) { // xxx::
|
|
|
|
- $fill = str_repeat(':0', 7-$c1);
|
|
+ $fill = str_repeat(':0', max(1, 7-$c1));
|
|
$uip = str_replace('::', $fill, $uip);
|
|
|
|
} else { // xxx::xxx
|
|
@@ -912,7 +912,7 @@ class Net_IPv6
|
|
|
|
}
|
|
|
|
- if (8 == $count) {
|
|
+ if (8 == $count and empty($ipPart[1])) {
|
|
|
|
return true;
|
|
|