MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on Windows when crawling (#10385)

Browse Source 
* readDirN: Check if file is directory

`syscall.FindNextFile` crashes if the handle is a file.

`errFileNotFound` matches 'unix' functionality: d19b434ffc/cmd/os-readdir_unix.go (L106)

Fixes #10384
This commit is contained in:
Klaus Post 2020-09-01 09:33:16 -07:00 committed by GitHub
parent 4b6585d249
commit 1c085f7d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/os-readdir_windows.go
View File

@ -19,6 +19,7 @@
package cmd package cmd
import ( import (
"io"
"os" "os"
"syscall" "syscall"
) )
@ -79,10 +80,16 @@ func readDirN(dirPath string, count int) (entries []string, err error) {
} }
defer f.Close() defer f.Close()
// Check if file or dir. This is the quickest way.
_, err = f.Seek(0, io.SeekStart)
if err == nil {
return nil, errFileNotFound
}
data := &syscall.Win32finddata{} data := &syscall.Win32finddata{}
handle := syscall.Handle(f.Fd())
for count != 0 { for count != 0 {
e := syscall.FindNextFile(syscall.Handle(f.Fd()), data) e := syscall.FindNextFile(handle, data)
if e != nil { if e != nil {
if e == syscall.ERROR_NO_MORE_FILES { if e == syscall.ERROR_NO_MORE_FILES {
break break