fix: avoid uintptr arithmetic when reading []string results

commit: 7850e384cde9eaab6c5ce5f1588a13798f2b5cec
author: brice · 6mo ago · 2026-04-13 04:37 UTC
parent: 91aa177
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +3 -3

M func.go +3 -3


@@ -448,14 +448,14 @@ func callAndReturn(ty reflect.Type, is32bit bool, cfn uintptr, sysargs *[maxArgs
448	448		v = reflect.Zero(outType)
449	449		} else {
450	450		var result []string
451		-	ptr := syscall.a1
	451	+	p := (unsafe.Pointer)(unsafe.Pointer(&syscall.a1))
452	452		for {
453		-	strPtr := (uintptr)(unsafe.Pointer(ptr))
	453	+	strPtr := (uintptr)(p)
454	454		if strPtr == 0 {
455	455		break
456	456		}
457	457		result = append(result, strings.GoString(strPtr))
458		-	ptr += unsafe.Sizeof(uintptr(0))
	458	+	p = unsafe.Add(p, unsafe.Sizeof(uintptr(0)))
459	459		}
460	460		v = reflect.ValueOf(result)
461	461		}


@@ -448,14 +448,14 @@ func callAndReturn(ty reflect.Type, is32bit bool, cfn uintptr, sysargs *[maxArgs
448		v = reflect.Zero(outType)	448		v = reflect.Zero(outType)
449		} else {	449		} else {
450		var result []string	450		var result []string
451	-	ptr := syscall.a1	451	+	p := (unsafe.Pointer)(unsafe.Pointer(&syscall.a1))
452		for {	452		for {
453	-	strPtr := (uintptr)(unsafe.Pointer(ptr))	453	+	strPtr := (uintptr)(p)
454		if strPtr == 0 {	454		if strPtr == 0 {
455		break	455		break
456		}	456		}
457		result = append(result, strings.GoString(strPtr))	457		result = append(result, strings.GoString(strPtr))
458	-	ptr += unsafe.Sizeof(uintptr(0))	458	+	p = unsafe.Add(p, unsafe.Sizeof(uintptr(0)))
459		}	459		}
460		v = reflect.ValueOf(result)	460		v = reflect.ValueOf(result)
461		}	461		}