Changeset 38094

Timestamp:

07/18/2016 07:42:48 PM (9 years ago)

Author:

ocean90

Message:

Filesystem API: Cleanup temporary file when the temporary file couldn't be opened.

Props ruud@joyo.
See #34772.
Fixes #36942, #36943.

Location:

trunk/src/wp-admin/includes

Files:

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

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

@@ -121 +121 @@
             return false;
         }
-        
+
         if ( ! @ftp_fget( $this->link, $temp, $file, FTP_BINARY ) ) {
             fclose( $temp );
@@ -127 +127 @@
             return false;
         }
-        
+
         fseek( $temp, 0 ); // Skip back to the start of the file being written to
         $contents = '';
@@ -160 +160 @@
         $tempfile = wp_tempnam($file);
         $temp = fopen( $tempfile, 'wb+' );
-        if ( ! $temp )
-            return false;
+
+        if ( ! $temp ) {
+            unlink( $tempfile );
+            return false;
+        }
 
         mbstring_binary_safe_encoding();

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

@@ -122 +122 @@
         $temp = wp_tempnam( $file );
 
-        if ( ! $temphandle = fopen($temp, 'w+') )
-            return false;
+        if ( ! $temphandle = fopen( $temp, 'w+' ) ) {
+            unlink( $temp );
+            return false;
+        }
 
         mbstring_binary_safe_encoding();