From 466698d127f3d934c83808d982c039c2957bfb1b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 2 Feb 2021 17:21:45 +0000 Subject: [PATCH] Upgrade/Install: Return a `WP_Error` from `copy_dir()` and `_copy_dir()` if the directory listing failed. Props afragen, dd32. Fixes #52342. git-svn-id: https://develop.svn.wordpress.org/trunk@50149 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/file.php | 4 ++++ src/wp-admin/includes/update-core.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index 9928582c7a..0432c6b730 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -1776,6 +1776,10 @@ function copy_dir( $from, $to, $skip_list = array() ) { $dirlist = $wp_filesystem->dirlist( $from ); + if ( false === $dirlist ) { + return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) ); + } + $from = trailingslashit( $from ); $to = trailingslashit( $to ); diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php index fea68cbad2..bbf233eb70 100644 --- a/src/wp-admin/includes/update-core.php +++ b/src/wp-admin/includes/update-core.php @@ -1352,6 +1352,10 @@ function _copy_dir( $from, $to, $skip_list = array() ) { $dirlist = $wp_filesystem->dirlist( $from ); + if ( false === $dirlist ) { + return new WP_Error( 'dirlist_failed__copy_dir', __( 'Directory listing failed.' ), basename( $to ) ); + } + $from = trailingslashit( $from ); $to = trailingslashit( $to );