Changeset 46980

Timestamp:

12/17/2019 09:18:07 PM (5 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 and limit it to run for each file in the directory + 1. Add a unit test to catch that in the future.

Props pbiron, azaozz.
Merges [46966] and [46976] to the 5.3 branch.
Fixes #48975.

Location:

branches/5.3

Files:

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

branches/5.3/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     = 0;
+
+                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 ) {

branches/5.3/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' ) );