From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 4 Aug 2022 19:05:15 +0000 (-0700)
Subject: debug/pe: use correct pe64 test in ImportedSymbols
X-Git-Tag: go1.20rc1~1759
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d6ccb4ead9c995ee2bff10079118bf91d1b646e9;p=gostls13.git

debug/pe: use correct pe64 test in ImportedSymbols

64-bit PE is set by the optional header magic number,
not by the machine field.

Fixes #54250

Change-Id: I4d01bc08553780d5470e63f0b17bbd968323e5d1
Reviewed-on: https://go-review.googlesource.com/c/go/+/421394
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
---

diff --git a/src/debug/pe/file.go b/src/debug/pe/file.go
index aa0955a133..e8b1a4f5e2 100644
--- a/src/debug/pe/file.go
+++ b/src/debug/pe/file.go
@@ -322,7 +322,7 @@ func (f *File) ImportedSymbols() ([]string, error) {
 		return nil, nil
 	}
 
-	pe64 := f.Machine == IMAGE_FILE_MACHINE_AMD64 || f.Machine == IMAGE_FILE_MACHINE_ARM64
+	_, pe64 := f.OptionalHeader.(*OptionalHeader64)
 
 	// grab the number of data directory entries
 	var dd_length uint32