Fix GH-8048: disk_*_space wrong for some filesystems on macOS

A macOS bug in libc statvfs(3) call truncates 64 bit elements (e.g. f_blocks) to 32 bits. Thus, we force macOS to use statfs. Closes GH-8056.
php · Mar 4, 2022 · 57ef16b · 57ef16b
1 parent e6cf583
commit 57ef16b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2022, PHP 8.0.18
 
+- Standard:
+  . Fixed bug GH-8048 (Force macOS to use statfs). (risner)
 
 17 Mar 2022, PHP 8.0.17
 

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
@@ -42,6 +42,16 @@
 #  include <os2.h>
 #endif
 
+#if defined(__APPLE__)
+  /*
+   Apple statvfs has an interger overflow in libc copying to statvfs.
+   cvt_statfs_to_statvfs(struct statfs *from, struct statvfs *to) {
+   to->f_blocks = (fsblkcnt_t)from->f_blocks;
+   */
+#  undef HAVE_SYS_STATVFS_H
+#  undef HAVE_STATVFS
+#endif
+
 #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
 # include <sys/statvfs.h>
 #elif defined(HAVE_SYS_STATFS_H) && defined(HAVE_STATFS)