Changeset 25349

Timestamp:

09/11/2013 08:26:57 AM (11 years ago)

Author:

dd32

Message:

Make use of the mbstring.func_overload helper functions in WP_Filesystem so byte lengths are properly determined. See #25259 Fixes #25237

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (1 diff)
• class-wp-filesystem-ftpext.php (modified) (1 diff)
• class-wp-filesystem-ftpsockets.php (modified) (5 diffs)

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

@@ -69 +69 @@
             return false;
 
+        mbstring_binary_safe_encoding();
+
+        $data_length = strlen( $contents );
+
         $bytes_written = fwrite( $fp, $contents );
 
+        reset_mbstring_encoding();
+
         fclose( $fp );
 
-        if ( false === $bytes_written || $bytes_written != strlen( $contents ) )
+        if ( $data_length !== $bytes_written )
             return false;
 

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

@@ -119 +119 @@
             return false;
 
+        mbstring_binary_safe_encoding();
+
+        $data_length = strlen( $contents );
         $bytes_written = fwrite( $temp, $contents );
-        if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+
+        reset_mbstring_encoding();
+
+        if ( $data_length !== $bytes_written ) {
             fclose( $temp );
             unlink( $tempfile );

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

@@ -90 +90 @@
             return false;
 
+        mbstring_binary_safe_encoding();
+
         if ( ! $this->ftp->fget($temphandle, $file) ) {
             fclose($temphandle);
             unlink($temp);
+
+            reset_mbstring_encoding();
+
             return ''; // Blank document, File does exist, It's just blank.
         }
+
+        reset_mbstring_encoding();
 
         fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
@@ -118 +125 @@
         }
 
+        // The FTP class uses string functions internally during file download/upload
+        mbstring_binary_safe_encoding();
+
         $bytes_written = fwrite( $temphandle, $contents );
         if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
             fclose( $temphandle );
             unlink( $temp );
+
+            reset_mbstring_encoding();
+
             return false;
         }
@@ -128 +141 @@
 
         $ret = $this->ftp->fput($file, $temphandle);
+
+        reset_mbstring_encoding();
 
         fclose($temphandle);
@@ -294 +309 @@
         }
 
+        mbstring_binary_safe_encoding();
+
         $list = $this->ftp->dirlist($path);
-        if ( empty($list) && !$this->exists($path) )
-            return false;
+        if ( empty( $list ) && ! $this->exists( $path ) ) {
+
+            reset_mbstring_encoding();
+
+            return false;
+        }
 
         $ret = array();
@@ -323 +344 @@
             $ret[ $struc['name'] ] = $struc;
         }
+
+        reset_mbstring_encoding();
+
         return $ret;
     }