Changeset 42010 for trunk/src/wp-admin/includes/file.php

Timestamp:

10/24/2017 11:10:37 PM (7 years ago)

Author:

johnbillion

Message:

Filesystem API: Don't immediately return an error for invalid file names contained within a Zip while it's being extracted.

This allows the extraction of the rest of the valid files within the archive to continue.

See #42016

File:

• trunk/src/wp-admin/includes/file.php (modified) (3 diffs)

trunk/src/wp-admin/includes/file.php

@@ -1120 +1120 @@
             continue;
 
+        // Don't extract invalid files:
         if ( 0 !== validate_file( $info['name'] ) ) {
-            return new WP_Error( 'invalid_file_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+            continue;
         }
 
@@ -1181 +1182 @@
             continue;
 
+        // Don't extract invalid files:
+        if ( 0 !== validate_file( $info['name'] ) ) {
+            continue;
+        }
+
         $contents = $z->getFromIndex($i);
         if ( false === $contents )
@@ -1284 +1290 @@
             continue;
 
+        // Don't extract invalid files:
         if ( 0 !== validate_file( $file['filename'] ) ) {
-            return new WP_Error( 'invalid_file_pclzip', __( 'Could not extract file from archive.' ), $file['filename'] );
+            continue;
         }