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

Fix potential crash on windows if raw.FileNameLength exceeds syscall.MAX_PATH #361

Merged
merged 5 commits into from Jan 26, 2022
Merged

Fix potential crash on windows if raw.FileNameLength exceeds syscall.MAX_PATH #361

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b76939
Fix crash on windows if raw.FileNameLength exceeds syscall.MAX_PATH
hu13 Mar 3, 2021
cf536d0
Add comment
hu13 Jan 15, 2022
aa5dd1f
Merge branch 'main' into issue-318
hu13 Jan 17, 2022
150fb2d
Update windows.go
hu13 Jan 19, 2022
02f7dfb
Merge branch 'main' into issue-318
hu13 Jan 19, 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
13 changes: 11 additions & 2 deletions windows.go
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ import (
"fmt"
"os"
"path/filepath"
"reflect"
"runtime"
"sync"
"syscall"
Expand Down Expand Up @@ -452,8 +453,16 @@ func (w *Watcher) readEvents() {

// Point "raw" to the event in the buffer
raw := (*syscall.FileNotifyInformation)(unsafe.Pointer(&watch.buf[offset]))
buf := (*[syscall.MAX_PATH]uint16)(unsafe.Pointer(&raw.FileName))
name := syscall.UTF16ToString(buf[:raw.FileNameLength/2])
// TODO: Consider using unsafe.Slice that is available from go1.17
// https://stackoverflow.com/questions/51187973/how-to-create-an-array-or-a-slice-from-an-array-unsafe-pointer-in-golang
// instead of using a fixed syscall.MAX_PATH buf, we create a buf that is the size of the path name
hu13 marked this conversation as resolved.
Show resolved Hide resolved
size := int(raw.FileNameLength / 2)
var buf []uint16
sh := (*reflect.SliceHeader)(unsafe.Pointer(&buf))
sh.Data = uintptr(unsafe.Pointer(&raw.FileName))
sh.Len = size
sh.Cap = size
name := syscall.UTF16ToString(buf)
fullname := filepath.Join(watch.path, name)

var mask uint64
Expand Down