Changeset 25304 for trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Timestamp:

09/09/2013 02:42:52 AM (13 years ago)

Author:

dd32

Message:

WP_Filesystem: Ensure that all files are read/written correctly by verifying the return values from fwrite() and using FTP_BINARY mode (ASCII converts line endings as per the spec). See #25237

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -76 +76 @@
                 }
 
-                $this->ftp->SetType(FTP_AUTOASCII);
-                $this->ftp->Passive(true);
-                $this->ftp->setTimeout(FS_TIMEOUT);
+                $this->ftp->SetType( FTP_BINARY );
+                $this->ftp->Passive( true );
+                $this->ftp->setTimeout( FS_TIMEOUT );
                 return true;
         }
 
-        function get_contents($file, $type = '', $resumepos = 0) {
+        function get_contents( $file ) {
                 if ( ! $this->exists($file) )
                         return false;
-
-                if ( empty($type) )
-                        $type = FTP_AUTOASCII;
-                $this->ftp->SetType($type);
 
                 $temp = wp_tempnam( $file );
@@ -123 +119 @@
                 }
 
-                fwrite($temphandle, $contents);
-                fseek($temphandle, 0); //Skip back to the start of the file being written to
-
-                $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-                $this->ftp->SetType($type);
+                $bytes_written = fwrite( $temphandle, $contents );
+                if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+                        fclose( $temphandle );
+                        unlink( $temp );
+                        return false;
+                }
+
+                fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
 
                 $ret = $this->ftp->fput($file, $temphandle);