Fix Go 1.15 checkptr failure; use golang.org/x/sys/windows.UTF16PtrToString

bradfitz · bradfitz · commit 43e9f18404d0 · 2020-10-21T09:32:00.000-07:00
The UTF16PtrToString version in golang.org/x/sys/windows doesn't
make slices pointing past the end of an allocation. Use it instead.

This lets programs using lxn/win and built with Go's race detector get
a bit further. Other race/checkptr issues with lxn/win and lxn/walk
remain for subsequent changes.

Signed-off-by: Brad Fitzpatrick &lt;brad@danga.com&gt;
diff --git a/AUTHORS b/AUTHORS
@@ -13,11 +13,14 @@ Alexander Neumann <an2048@googlemail.com>
 Aman Gupta <aman@tmm1.net>
 Anton Lahti <antonlahti@gmail.com>
 Benny Siegert <bsiegert@gmail.com>
+Brad Fitzpatrick <bradfitz@tailscale.com>
 Bruno Bigras <bigras.bruno@gmail.com>
 Carl Kittelberger <icedream@icedream.pw>
 Carlos Cobo <toqueteos@gmail.com>
 Cary Cherng <ccherng@gmail.com>
+Cory Redmond <ace@ac3-servers.eu>
 David Porter <david@porter.me>
+Dmitry Bagdanov <dimbojob@gmail.com>
 gonutz
 Hill <zhubicen@gmail.com>
 Jason A. Donenfeld <Jason@zx2c4.com>
@@ -29,6 +32,3 @@ ryujimiya <ryujimiya236@gmail.com>
 Simon Rozman <simon@rozman.si>
 Tiago Carvalho <sugoiuguu@tfwno.gf>
 wsf01 <wf1337@sina.com>
-gonutz
-Cory Redmond <ace@ac3-servers.eu>
-Dmitry Bagdanov <dimbojob@gmail.com>
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/lxn/win
 
 go 1.12
 
-require golang.org/x/sys v0.0.0-20190904154756-749cb33beabd
+require golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13
diff --git a/win.go b/win.go
@@ -7,8 +7,9 @@
 package win
 
 import (
-	"syscall"
 	"unsafe"
+
+	"golang.org/x/sys/windows"
 )
 
 const (
@@ -70,10 +71,7 @@ func HIWORD(dw uint32) uint16 {
 }
 
 func UTF16PtrToString(s *uint16) string {
-	if s == nil {
-		return ""
-	}
-	return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])
+	return windows.UTF16PtrToString(s)
 }
 
 func MAKEINTRESOURCE(id uintptr) *uint16 {

-Original file line number
+Diff line change
 Aman Gupta <[email protected]>
 Anton Lahti <[email protected]>
 Benny Siegert <[email protected]>
 +Brad Fitzpatrick <[email protected]>
 Bruno Bigras <[email protected]>
 Carl Kittelberger <[email protected]>
 Carlos Cobo <[email protected]>
 Cary Cherng <[email protected]>
 +Cory Redmond <[email protected]>
 David Porter <[email protected]>
 +Dmitry Bagdanov <[email protected]>
 gonutz
 Hill <[email protected]>
 Jason A. Donenfeld <[email protected]>
 Simon Rozman <[email protected]>
 Tiago Carvalho <[email protected]>
 wsf01 <[email protected]>
 -gonutz
 -Cory Redmond <[email protected]>
 -Dmitry Bagdanov <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ module github.com/lxn/win`
`2`	`2`
`3`	`3`	`go 1.12`
`4`	`4`
`5`		`-require golang.org/x/sys v0.0.0-20190904154756-749cb33beabd`
	`5`	`+require golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@`
`7`	`7`	`package win`
`8`	`8`
`9`	`9`	`import (`
`10`		`- "syscall"`
`11`	`10`	`"unsafe"`
	`11`	`+`
	`12`	`+ "golang.org/x/sys/windows"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`const (`
`@@ -70,10 +71,7 @@ func HIWORD(dw uint32) uint16 {`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`func UTF16PtrToString(s *uint16) string {`
`73`		`- if s == nil {`
`74`		`- return ""`
`75`		`- }`
`76`		`- return syscall.UTF16ToString((*[1 << 29]uint16)(unsafe.Pointer(s))[0:])`
	`74`	`+ return windows.UTF16PtrToString(s)`
`77`	`75`	`}`
`78`	`76`
`79`	`77`	`func MAKEINTRESOURCE(id uintptr) *uint16 {`