Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Truncate the Getfsstat result to the count of items that were returned #1392

Merged
merged 4 commits into from Dec 18, 2022
Merged

Truncate the Getfsstat result to the count of items that were returned #1392

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5e42b9
Truncate the result of Getfsstat to the item count that is returned.
brianryner8 Dec 7, 2022
34da06e
fix
brianryner8 Dec 7, 2022
c2fa2cb
Update comment
brianryner8 Dec 18, 2022
8d22915
[disk][darwin]: add issue URL
shirou Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion disk/disk_darwin.go
View file
Open in desktop
Expand Up @@ -20,9 +20,15 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
return ret, err
}
fs := make([]unix.Statfs_t, count)
if _, err = unix.Getfsstat(fs, unix.MNT_WAIT); err != nil {
count, err = unix.Getfsstat(fs, unix.MNT_WAIT)
if err != nil {
return ret, err
}
// On 10.14, and possibly other OS versions, the actual count may
// be less than from the first call. Truncate to the returned count
// to prevent accessing uninitialized entries.
// https://github.com/shirou/gopsutil/issues/1390
fs = fs[:count]
for _, stat := range fs {
opts := []string{"rw"}
if stat.Flags&unix.MNT_RDONLY != 0 {
Expand Down