vulncheck/internal/gosym: fix bug on 32-bit systems

sayjun0505 · sayjun0505 · commit e813834a2134 · 2022-04-08T09:40:41.000Z
I was multiplying an offset by 8, instead of the size of a pointer. Fixes golang/go#52218. Change-Id: I396c833e52a96aff34b89e4e53053d15b4a0d1cd Reviewed-on: https://go-review.googlesource.com/c/vuln/+/398757 Trust: Jonathan Amsterdam <jba@google.com> Run-TryBot: Jonathan Amsterdam <jba@google.com> Reviewed-by: Bryan Mills <bcmills@google.com> TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/vulncheck/internal/gosym/pclntab.go b/vulncheck/internal/gosym/pclntab.go
@@ -579,7 +579,7 @@ func (f funcData) funcdataOffset(i uint8) uint32 {
 	} else {
 		off = f.fieldOffset(10) + // skip fixed part of _func
 			f.npcdata()*4
-		off += uint32(i) * 8
+		off += uint32(i) * f.t.ptrsize
 	}
 	return f.t.binary.Uint32(f.data[off:])
 }

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ func (f funcData) funcdataOffset(i uint8) uint32 {`
`579`	`579`	`} else {`
`580`	`580`	`off = f.fieldOffset(10) + // skip fixed part of _func`
`581`	`581`	`f.npcdata()*4`
`582`		`- off += uint32(i) * 8`
	`582`	`+ off += uint32(i) * f.t.ptrsize`
`583`	`583`	`}`
`584`	`584`	`return f.t.binary.Uint32(f.data[off:])`
`585`	`585`	`}`