From d32ec3352ba08a69a97351dcad5f213e220e5306 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 12 Jun 2020 12:33:12 +0000 Subject: [PATCH] Filesystem API: Avoid a PHP notice in `WP_Filesystem_Direct::owner()` and `::group()` methods and their `WP_Filesystem_SSH2` counterparts. Although not officially documented in the PHP manual, `posix_getpwuid()` and `posix_getgrgid()` can return `false` in some circumstances. Props logig. Fixes #50373. git-svn-id: https://develop.svn.wordpress.org/trunk@48031 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-filesystem-direct.php | 6 ++++++ src/wp-admin/includes/class-wp-filesystem-ssh2.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/wp-admin/includes/class-wp-filesystem-direct.php b/src/wp-admin/includes/class-wp-filesystem-direct.php index 7551e3d273..17ccad8d5d 100644 --- a/src/wp-admin/includes/class-wp-filesystem-direct.php +++ b/src/wp-admin/includes/class-wp-filesystem-direct.php @@ -223,6 +223,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base { return $owneruid; } $ownerarray = posix_getpwuid( $owneruid ); + if ( ! $ownerarray ) { + return false; + } return $ownerarray['name']; } @@ -257,6 +260,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base { return $gid; } $grouparray = posix_getgrgid( $gid ); + if ( ! $grouparray ) { + return false; + } return $grouparray['name']; } diff --git a/src/wp-admin/includes/class-wp-filesystem-ssh2.php b/src/wp-admin/includes/class-wp-filesystem-ssh2.php index c099259e1f..94853a650b 100644 --- a/src/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/src/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -402,6 +402,9 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return $owneruid; } $ownerarray = posix_getpwuid( $owneruid ); + if ( ! $ownerarray ) { + return false; + } return $ownerarray['name']; } @@ -434,6 +437,9 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return $gid; } $grouparray = posix_getgrgid( $gid ); + if ( ! $grouparray ) { + return false; + } return $grouparray['name']; }