chore: switch syscall.SyscallN back to syscall.Syscall6
Some checks failed
Trigger CMFA Update / trigger-CMFA-update (push) Failing after 16s

Until the current version, SyscallN always escapes the variadic argument
This commit is contained in:
wwqgtxx 2024-11-08 09:40:38 +08:00
parent 91d54bdac1
commit 215bf0995f

View File

@ -180,7 +180,7 @@ func newSearcher(isV4, isTCP bool) *searcher {
func getTransportTable(fn uintptr, family int, class int) ([]byte, error) { func getTransportTable(fn uintptr, family int, class int) ([]byte, error) {
for size, buf := uint32(8), make([]byte, 8); ; { for size, buf := uint32(8), make([]byte, 8); ; {
ptr := unsafe.Pointer(&buf[0]) ptr := unsafe.Pointer(&buf[0])
err, _, _ := syscall.SyscallN(fn, uintptr(ptr), uintptr(unsafe.Pointer(&size)), 0, uintptr(family), uintptr(class), 0) err, _, _ := syscall.Syscall6(fn, uintptr(ptr), uintptr(unsafe.Pointer(&size)), 0, uintptr(family), uintptr(class), 0, 0)
switch err { switch err {
case 0: case 0:
@ -215,12 +215,15 @@ func getExecPathFromPID(pid uint32) (string, error) {
buf := make([]uint16, syscall.MAX_LONG_PATH) buf := make([]uint16, syscall.MAX_LONG_PATH)
size := uint32(len(buf)) size := uint32(len(buf))
r1, _, err := syscall.SyscallN( r1, _, err := syscall.Syscall6(
queryProcName, queryProcName,
uintptr(h), uintptr(h),
uintptr(0), uintptr(0),
uintptr(unsafe.Pointer(&buf[0])), uintptr(unsafe.Pointer(&buf[0])),
uintptr(unsafe.Pointer(&size)), uintptr(unsafe.Pointer(&size)),
0,
0,
0,
) )
if r1 == 0 { if r1 == 0 {
return "", err return "", err