Skip to content

fix memmod checkptr fail #25

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 memmod checkptr fail #25

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion driver/memmod/memmod_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ func alignUp(value, alignment uintptr) uintptr {
}

func a2p(addr uintptr) unsafe.Pointer {
return unsafe.Pointer(addr)
return unsafe.Add(unsafe.Pointer(nil), addr)
}

func memcpy(dst, src, size uintptr) {
Expand Down
12 changes: 8 additions & 4 deletions driver/memmod/syscall_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,14 @@ type IMAGE_NT_HEADERS struct {
}

func (ntheader *IMAGE_NT_HEADERS) Sections() []IMAGE_SECTION_HEADER {
return (*[0xffff]IMAGE_SECTION_HEADER)(unsafe.Pointer(
(uintptr)(unsafe.Pointer(ntheader)) +
unsafe.Offsetof(ntheader.OptionalHeader) +
uintptr(ntheader.FileHeader.SizeOfOptionalHeader)))[:ntheader.FileHeader.NumberOfSections]
ptr := unsafe.Pointer(ntheader)
ptr = unsafe.Add(ptr, unsafe.Offsetof(ntheader.OptionalHeader))
ptr = unsafe.Add(ptr, ntheader.FileHeader.SizeOfOptionalHeader)

return unsafe.Slice(
(*IMAGE_SECTION_HEADER)(ptr),
ntheader.FileHeader.NumberOfSections,
)
}

const (
Expand Down