From becd2a83c7a22c28bb24ac95364171b23a3d27d2 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 11 Jul 2018 23:25:38 +0000 Subject: [PATCH] syscall: convert Windows AddrinfoW.Addr from uintptr to syscall.Pointer API compatibility violation, but it wasn't safe before and people should be using golang.org/x/sys/windows instead. Fixes #24820 Change-Id: I3b43493f56b3116924b9d848a294899279f314fd Reviewed-on: https://go-review.googlesource.com/123455 Run-TryBot: Brad Fitzpatrick Reviewed-by: Austin Clements Reviewed-by: Ian Lance Taylor TryBot-Result: Gobot Gobot --- api/except.txt | 6 ++++-- api/go1.11.txt | 2 ++ src/syscall/types_windows.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api/except.txt b/api/except.txt index e104f8e17b..46dbb45892 100644 --- a/api/except.txt +++ b/api/except.txt @@ -362,17 +362,19 @@ pkg syscall (openbsd-386-cgo), const SYS_KILL = 37 pkg syscall (openbsd-amd64), const SYS_KILL = 37 pkg syscall (openbsd-amd64-cgo), const SYS_KILL = 37 pkg unicode, const Version = "9.0.0" +pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983295 +pkg syscall (windows-386), type AddrinfoW struct, Addr uintptr pkg syscall (windows-386), type CertChainPolicyPara struct, ExtraPolicyPara uintptr pkg syscall (windows-386), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr pkg syscall (windows-386), type CertContext struct, CertInfo uintptr pkg syscall (windows-386), type CertRevocationInfo struct, CrlInfo uintptr pkg syscall (windows-386), type CertRevocationInfo struct, OidSpecificInfo uintptr pkg syscall (windows-386), type CertSimpleChain struct, TrustListInfo uintptr -pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983295 +pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983295 +pkg syscall (windows-amd64), type AddrinfoW struct, Addr uintptr pkg syscall (windows-amd64), type CertChainPolicyPara struct, ExtraPolicyPara uintptr pkg syscall (windows-amd64), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr pkg syscall (windows-amd64), type CertContext struct, CertInfo uintptr pkg syscall (windows-amd64), type CertRevocationInfo struct, CrlInfo uintptr pkg syscall (windows-amd64), type CertRevocationInfo struct, OidSpecificInfo uintptr pkg syscall (windows-amd64), type CertSimpleChain struct, TrustListInfo uintptr -pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983295 diff --git a/api/go1.11.txt b/api/go1.11.txt index ead2a59e16..b0a7f64c52 100644 --- a/api/go1.11.txt +++ b/api/go1.11.txt @@ -529,6 +529,7 @@ pkg syscall (openbsd-amd64-cgo), func Pipe2([]int, int) error pkg syscall (windows-386), const TOKEN_ADJUST_SESSIONID = 256 pkg syscall (windows-386), const TOKEN_ADJUST_SESSIONID ideal-int pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983551 +pkg syscall (windows-386), type AddrinfoW struct, Addr Pointer pkg syscall (windows-386), type CertChainPolicyPara struct, ExtraPolicyPara Pointer pkg syscall (windows-386), type CertChainPolicyStatus struct, ExtraPolicyStatus Pointer pkg syscall (windows-386), type CertContext struct, CertInfo *CertInfo @@ -542,6 +543,7 @@ pkg syscall (windows-386), type Pointer *struct pkg syscall (windows-amd64), const TOKEN_ADJUST_SESSIONID = 256 pkg syscall (windows-amd64), const TOKEN_ADJUST_SESSIONID ideal-int pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983551 +pkg syscall (windows-amd64), type AddrinfoW struct, Addr Pointer pkg syscall (windows-amd64), type CertChainPolicyPara struct, ExtraPolicyPara Pointer pkg syscall (windows-amd64), type CertChainPolicyStatus struct, ExtraPolicyStatus Pointer pkg syscall (windows-amd64), type CertContext struct, CertInfo *CertInfo diff --git a/src/syscall/types_windows.go b/src/syscall/types_windows.go index 23ea5dbf14..6911fe509c 100644 --- a/src/syscall/types_windows.go +++ b/src/syscall/types_windows.go @@ -1009,7 +1009,7 @@ type AddrinfoW struct { Protocol int32 Addrlen uintptr Canonname *uint16 - Addr uintptr + Addr Pointer Next *AddrinfoW } -- 2.50.0