diff options
| author | Austin Clements <austin@google.com> | 2016-01-08 16:25:29 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2016-01-14 02:05:31 +0000 |
| commit | 535741a69a1300d1fe2800778b99c8a1b75d7fdd (patch) | |
| tree | 1e74f282d5c78c6a352576b6abe8087be9f51fc2 /src/debug/dwarf/typeunit.go | |
| parent | 5f23bc8903c9b7930398c154b884979a1a43946f (diff) | |
| download | go-535741a69a1300d1fe2800778b99c8a1b75d7fdd.tar.xz | |
debug/dwarf: fix nil pointer dereference in cyclic type structures
Currently readType simultaneously constructs a type graph and resolves
the sizes of the types. However, these two operations are
fundamentally at odds: the order we parse a cyclic structure in may be
different than the order we need to resolve type sizes in. As a
result, it's possible that when readType attempts to resolve the size
of a typedef, it may dereference a nil Type field of another typedef
retrieved from the type cache that's only partially constructed.
To fix this, we delay resolving typedef sizes until the end of the
readType recursion, when the full type graph is constructed.
Fixes #13039.
Change-Id: I9889af37fb3be5437995030fdd61e45871319d07
Reviewed-on: https://go-review.googlesource.com/18459
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/debug/dwarf/typeunit.go')
| -rw-r--r-- | src/debug/dwarf/typeunit.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/debug/dwarf/typeunit.go b/src/debug/dwarf/typeunit.go index 9cfb4a8b25..0f4e07ebf7 100644 --- a/src/debug/dwarf/typeunit.go +++ b/src/debug/dwarf/typeunit.go @@ -101,7 +101,7 @@ func (d *Data) sigToType(sig uint64) (Type, error) { b := makeBuf(d, tu, tu.name, tu.off, tu.data) r := &typeUnitReader{d: d, tu: tu, b: b} - t, err := d.readType(tu.name, r, Offset(tu.toff), make(map[Offset]Type)) + t, err := d.readType(tu.name, r, Offset(tu.toff), make(map[Offset]Type), nil) if err != nil { return nil, err } |
