Changeset 48031

Timestamp:

06/12/2020 12:33:12 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (2 diffs)
• class-wp-filesystem-ssh2.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -224 +224 @@
         }
         $ownerarray = posix_getpwuid( $owneruid );
+        if ( ! $ownerarray ) {
+            return false;
+        }
         return $ownerarray['name'];
     }
@@ -258 +261 @@
         }
         $grouparray = posix_getgrgid( $gid );
+        if ( ! $grouparray ) {
+            return false;
+        }
         return $grouparray['name'];
     }

trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -403 +403 @@
         }
         $ownerarray = posix_getpwuid( $owneruid );
+        if ( ! $ownerarray ) {
+            return false;
+        }
         return $ownerarray['name'];
     }
@@ -435 +438 @@
         }
         $grouparray = posix_getgrgid( $gid );
+        if ( ! $grouparray ) {
+            return false;
+        }
         return $grouparray['name'];
     }