OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1267 from easyops-cn/master 

fix(process): fix OpenFilesWithContext panic problem
This commit is contained in:
shirou 2022-03-05 11:22:21 +09:00 committed by GitHub
parent f3b7c002d7 3cd259698f
commit 7de7d48ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
process/process_windows.go
View File

@ -697,8 +697,8 @@ func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, er
// release the new handle
defer windows.CloseHandle(windows.Handle(file))
fileType, _ := windows.GetFileType(windows.Handle(file))
if fileType != windows.FILE_TYPE_DISK {
fileType, err := windows.GetFileType(windows.Handle(file))
if err != nil || fileType != windows.FILE_TYPE_DISK {
continue
}
@ -720,8 +720,8 @@ func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, er
case <-time.NewTimer(100 * time.Millisecond).C:
continue
case <-ch:
fileInfo, _ := os.Stat(fileName)
if fileInfo.IsDir() {
fileInfo, err := os.Stat(fileName)
if err != nil || fileInfo.IsDir() {
continue
}