Merge pull request #1267 from easyops-cn/master

fix(process): fix OpenFilesWithContext panic problem
shirou · Mar 5, 2022 · 7de7d48 · 7de7d48
2 parents f3b7c00 + 3cd2596
commit 7de7d48
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/process/process_windows.go b/process/process_windows.go
@@ -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
 			}