Skip to content

Fix checkptr panic in readDirnames #59

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix checkptr panic in readDirnames #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions readdir_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ func readDirents(osDirname string, scratchBuffer []byte) ([]*Dirent, error) {
func readDirnames(osDirname string, scratchBuffer []byte) ([]string, error) {
var entries []string
var workBuffer []byte
var sde *syscall.Dirent

dh, err := os.Open(osDirname)
if err != nil {
Expand All @@ -91,6 +90,7 @@ func readDirnames(osDirname string, scratchBuffer []byte) ([]string, error) {
scratchBuffer = newScratchBuffer()
}

var sde syscall.Dirent
for {
if len(workBuffer) == 0 {
n, err := syscall.ReadDirent(fd, scratchBuffer)
Expand All @@ -111,15 +111,14 @@ func readDirnames(osDirname string, scratchBuffer []byte) ([]string, error) {
workBuffer = scratchBuffer[:n] // trim work buffer to number of bytes read
}

sde = (*syscall.Dirent)(unsafe.Pointer(&workBuffer[0])) // point entry to first syscall.Dirent in buffer
// Handle first entry in the work buffer.
workBuffer = workBuffer[reclen(sde):] // advance buffer for next iteration through loop
copy((*[unsafe.Sizeof(syscall.Dirent{})]byte)(unsafe.Pointer(&sde))[:], workBuffer)
workBuffer = workBuffer[reclen(&sde):] // advance buffer for next iteration through loop

if inoFromDirent(sde) == 0 {
if inoFromDirent(&sde) == 0 {
continue // inode set to 0 indicates an entry that was marked as deleted
}

nameSlice := nameFromDirent(sde)
nameSlice := nameFromDirent(&sde)
nameLength := len(nameSlice)

if nameLength == 0 || (nameSlice[0] == '.' && (nameLength == 1 || (nameLength == 2 && nameSlice[1] == '.'))) {
Expand Down