Date: Wed, 31 Aug 2016 14:33:36 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421168 - in head/net/pear-Net_IPv6: . files Message-ID: <201608311433.u7VEXaF0060141@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Wed Aug 31 14:33:36 2016 New Revision: 421168 URL: https://svnweb.freebsd.org/changeset/ports/421168 Log: Fix some bad IPv6 validation issues 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) Added: head/net/pear-Net_IPv6/files/ head/net/pear-Net_IPv6/files/patch-Net_IPv6.php (contents, props changed) Modified: head/net/pear-Net_IPv6/Makefile Modified: head/net/pear-Net_IPv6/Makefile ============================================================================== --- head/net/pear-Net_IPv6/Makefile Wed Aug 31 14:30:13 2016 (r421167) +++ head/net/pear-Net_IPv6/Makefile Wed Aug 31 14:33:36 2016 (r421168) @@ -3,6 +3,7 @@ PORTNAME= Net_IPv6 DISTVERSION= 1.3.0.b2 +PORTREVISION= 1 CATEGORIES= net pear DISTNAME= ${PORTNAME}-1.3.0b2 Added: head/net/pear-Net_IPv6/files/patch-Net_IPv6.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pear-Net_IPv6/files/patch-Net_IPv6.php Wed Aug 31 14:33:36 2016 (r421168) @@ -0,0 +1,35 @@ +--- 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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608311433.u7VEXaF0060141>