Changeset 12387 for trunk/wp-admin/includes/class-ftp.php

Timestamp:

12/13/2009 12:02:01 AM (15 years ago)

Author:

westi

Message:

Fix the IP Address validation code in the FTP class. Fixes #11393 props nacin.

File:

• trunk/wp-admin/includes/class-ftp.php (modified) (1 diff)

trunk/wp-admin/includes/class-ftp.php

@@ -279 +279 @@
             if(!$ip) $ip=$host;
             if(!$dns) $dns=$host;
-            if(ip2long($ip) === -1) {
+            // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
+            // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
+            $ipaslong = ip2long($ip);
+            if ( ($ipaslong == false) || ($ipaslong === -1) ) {
                 $this->SendMSG("Wrong host name/address \"".$host."\"");
                 return FALSE;