Changeset 59257 for trunk/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

10/18/2024 11:35:02 PM (2 years ago)

Author:

azaozz

Message:

Upgrade/Install: Return WP_Error when source files cannot be found.

Fixes a fatal error in array_keys() (PHP 8.0+) as $wp_filesystem->dirlist() will return false when the source directory doesn't exist or becomes unreadable for some reason.

Props: verygoode, lifelightweb, da5f656f, costdev, afragen, azaozz
Fixes #61114

File:

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

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -205 +205 @@
                 $this->strings['incompatible_archive'] = __( 'The package could not be installed.' );
                 $this->strings['files_not_writable']   = __( 'The update cannot be installed because some files could not be copied. This is usually due to inconsistent file permissions.' );
+                $this->strings['dir_not_readable']     = __( 'A directory could not be read.' );
 
                 $this->strings['maintenance_start'] = __( 'Enabling Maintenance mode…' );
@@ -559 +560 @@
                 $local_destination = $destination;
 
-                $source_files       = array_keys( $wp_filesystem->dirlist( $remote_source ) );
+                $dirlist = $wp_filesystem->dirlist( $remote_source );
+
+                if ( false === $dirlist ) {
+                        return new WP_Error( 'source_read_failed', $this->strings['fs_error'], $this->strings['dir_not_readable'] );
+                }
+
+                $source_files       = array_keys( $dirlist );
                 $remote_destination = $wp_filesystem->find_folder( $local_destination );
 
@@ -606 +613 @@
                 // Has the source location changed? If so, we need a new source_files list.
                 if ( $source !== $remote_source ) {
-                        $source_files = array_keys( $wp_filesystem->dirlist( $source ) );
+                        $dirlist = $wp_filesystem->dirlist( $source );
+
+                        if ( false === $dirlist ) {
+                                return new WP_Error( 'new_source_read_failed', $this->strings['fs_error'], $this->strings['dir_not_readable'] );
+                        }
+
+                        $source_files = array_keys( $dirlist );
                 }