Changeset 46966

Timestamp:

12/16/2019 11:42:34 PM (7 years ago)

Author:

azaozz

Message:

Upload: Fix the final file name collision test in wp_unique_filename() when uploading a file with upper case extension. Add a unit test to catch that in the future.

Fixes #48975 for trunk.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (3 diffs)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -2411 +2411 @@
         // Sanitize the file name before we begin processing.
         $filename = sanitize_file_name( $filename );
+        $ext2     = null;
 
         // Separate the filename into a name and extension.
@@ -2486 +2487 @@
 
                         if ( ! empty( $files ) ) {
-                                while ( _wp_check_existing_file_names( $filename, $files ) ) {
+                                // The extension case may have changed above.
+                                $new_ext = ! empty( $ext2 ) ? $ext2 : $ext;
+
+                                // Ensure this never goes into infinite loop
+                                // as it uses pathinfo() and regex in the check but string replacement for the changes.
+                                $count = count( $files );
+                                $i     = 1;
+
+                                while ( $i <= $count && _wp_check_existing_file_names( $filename, $files ) ) {
                                         $new_number = (int) $number + 1;
-                                        $filename   = str_replace( array( "-{$number}{$ext}", "{$number}{$ext}" ), "-{$new_number}{$ext}", $filename );
+                                        $filename   = str_replace( array( "-{$number}{$new_ext}", "{$number}{$new_ext}" ), "-{$new_number}{$new_ext}", $filename );
                                         $number     = $new_number;
+                                        $i++;
                                 }
                         }
@@ -2531 +2541 @@
         }
 
-        $regex = '/^' . preg_quote( $fname ) . '-(?:\d+x\d+|scaled|rotated)' . preg_quote( $ext ) . '$/';
+        $regex = '/^' . preg_quote( $fname ) . '-(?:\d+x\d+|scaled|rotated)' . preg_quote( $ext ) . '$/i';
 
         foreach ( $files as $file ) {

trunk/tests/phpunit/tests/functions.php

@@ -209 +209 @@
                 // Existing files: one-blue-pixel-100x100.png, one-blue-pixel-1-100x100.png.
                 $this->assertEquals( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.png' ) );
+                // Same as above with upper case extension.
+                $this->assertEquals( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.PNG' ) );
 
                 remove_filter( 'upload_dir', array( $this, 'upload_dir_patch_basedir' ) );