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

Timestamp:

09/27/2023 04:29:37 PM (13 months ago)

Author:

costdev

Message:

Filesystem API: Free the archive in _unzip_file_ziparchive().

There are several early returns in _unzip_file_ziparchive() which don't close the archive prior to returning.

As this function is used in installation and upgrade processes which are memory-intensive, this calls ZipArchive::close() to free the archive prior to each early return. This excludes the first return which is a result of a failure to open the archive, which is ​freed internally when the failure occurs.

References:

• PHP.net: ​ZipArchive::open() and ​ZipArchive::close()
• libzip: ​zip_open() and ​zip_close()

Follow-up to: [13005], [13006], [13015], [13221], [14346] [25779].

Props azaozz, afragen, joemcgill, costdev.
Fixes #59467

File:

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

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

@@ -1673 +1673 @@
 
         if ( ! $info ) {
+            $z->close();
             return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
         }
@@ -1710 +1711 @@
 
         if ( $available_space && ( $required_space > $available_space ) ) {
+            $z->close();
             return new WP_Error(
                 'disk_full_unzip_file',
@@ -1747 +1749 @@
         // Only check to see if the Dir exists upon creation failure. Less I/O this way.
         if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
+            $z->close();
             return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), $_dir );
         }
@@ -1775 +1778 @@
 
         if ( ! $info ) {
+            $z->close();
             return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
         }
@@ -1794 +1798 @@
 
         if ( false === $contents ) {
+            $z->close();
             return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
         }
 
         if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE ) ) {
+            $z->close();
             return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
         }