aboutsummaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2017-12-15 18:02:57 -0800
committerIan Lance Taylor <iant@golang.org>2018-02-15 18:54:41 +0000
commitff3885dc11caddd98ee1c2f9e38ee344edc9c31e (patch)
tree195dd8e8dbf94ea4bb2d2889e9d8bdb130d944f1 /src/debug
parent6977a3b257dbf28494f43539908e65b229c315d3 (diff)
downloadgo-ff3885dc11caddd98ee1c2f9e38ee344edc9c31e.tar.xz
debug/dwarf: formStrp uses a 64-bit value for 64-bit DWARF
No test as the only system I know that uses 64-bit DWARF is AIX. Change-Id: I24e225253075be188845656b6778993c2d24ebf5 Reviewed-on: https://go-review.googlesource.com/84379 Run-TryBot: Ian Lance Taylor <iant@golang.org> Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/dwarf/entry.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/debug/dwarf/entry.go b/src/debug/dwarf/entry.go
index ffa61c28d1..6be0700b7e 100644
--- a/src/debug/dwarf/entry.go
+++ b/src/debug/dwarf/entry.go
@@ -461,7 +461,18 @@ func (b *buf) entry(atab abbrevTable, ubase Offset) *Entry {
case formString:
val = b.string()
case formStrp:
- off := b.uint32() // offset into .debug_str
+ var off uint64 // offset into .debug_str
+ is64, known := b.format.dwarf64()
+ if !known {
+ b.error("unknown size for DW_FORM_strp")
+ } else if is64 {
+ off = b.uint64()
+ } else {
+ off = uint64(b.uint32())
+ }
+ if uint64(int(off)) != off {
+ b.error("DW_FORM_strp offset out of range")
+ }
if b.err != nil {
return nil
}