diff options
| author |   Brad Fitzpatrick <bradfitz@tailscale.com> | 2020-10-19 09:36:52 -0700 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-21 18:11:40 +0200 |
| commit | 7d6fe89192fbf6fce63ca516cde306c9a17b8a7e (patch) | |
| tree | ce362f10c9da479b94915137095ab63f5ce8f582 /embeddable-dll-service | |
| parent | build: use crowdin backdoor instead of api key (diff) | |
| download | wireguard-windows-7d6fe89192fbf6fce63ca516cde306c9a17b8a7e.tar.xz wireguard-windows-7d6fe89192fbf6fce63ca516cde306c9a17b8a7e.zip | |
winipcfg, embeddable-dll-service, wintrust: fix Go 1.15 checkptr violations
Avoids "converted pointer straddles allocation" failures at runtime
when building binaries in race mode with Go 1.15, which enables
checkptr: https://golang.org/doc/go1.15#windows
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
[Jason: Note Go 1.16/1.17 todo item.]
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'embeddable-dll-service')
| -rw-r--r-- | embeddable-dll-service/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embeddable-dll-service/main.go b/embeddable-dll-service/main.go index 27fca4ee..e27ac1a9 100644 --- a/embeddable-dll-service/main.go +++ b/embeddable-dll-service/main.go @@ -22,7 +22,7 @@ import ( //export WireGuardTunnelService func WireGuardTunnelService(confFile16 *uint16) bool { - confFile := windows.UTF16ToString((*[(1 << 30) - 1]uint16)(unsafe.Pointer(confFile16))[:]) + confFile := windows.UTF16PtrToString(confFile16) conf.PresetRootDirectory(filepath.Dir(confFile)) tunnel.UseFixedGUIDInsteadOfDeterministic = true err := tunnel.Run(confFile) |