windows: support ill-formed UTF-16 in UTF16PtrToString

qmuntal · qmuntal · commit 914b96c1bddd · 2024-02-01T17:02:20.000Z
UTF16PtrToString does not support ill-formed UTF-16 because it uses utf16.Decode, which expects well-formed UTF-16. This CL updates the UTF16PtrToString implementation to use UTF16ToString instead of utf16.Decode, which supports ill-formed UTF-16 since go1.21 via syscall.UTF16ToString. Change-Id: Ifb72b6d38a8c08ad90ec6a47eed05fc3739500a1 Reviewed-on: https://go-review.googlesource.com/c/sys/+/560355 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Bryan Mills <bcmills@google.com> Reviewed-by: Michael Knyszek <mknyszek@google.com>
diff --git a/windows/syscall_windows.go b/windows/syscall_windows.go
@@ -125,8 +125,7 @@ func UTF16PtrToString(p *uint16) string {
 	for ptr := unsafe.Pointer(p); *(*uint16)(ptr) != 0; n++ {
 		ptr = unsafe.Pointer(uintptr(ptr) + unsafe.Sizeof(*p))
 	}
-
-	return string(utf16.Decode(unsafe.Slice(p, n)))
+	return UTF16ToString(unsafe.Slice(p, n))
 }
 
 func Getpagesize() int { return 4096 }

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,7 @@ func UTF16PtrToString(p *uint16) string {`
`125`	`125`	`for ptr := unsafe.Pointer(p); (uint16)(ptr) != 0; n++ {`
`126`	`126`	`ptr = unsafe.Pointer(uintptr(ptr) + unsafe.Sizeof(*p))`
`127`	`127`	`}`
`128`		`-`
`129`		`- return string(utf16.Decode(unsafe.Slice(p, n)))`
	`128`	`+ return UTF16ToString(unsafe.Slice(p, n))`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`func Getpagesize() int { return 4096 }`