summaryrefslogtreecommitdiff
path: root/src/runtime
diff options
context:
space:
mode:
authorAram H?v?rneanu <aram@mgk.ro>2014-11-14 14:25:49 +0100
committerAram H?v?rneanu <aram@mgk.ro>2014-11-14 14:25:49 +0100
commit9400d916b5332a746dacd8398c8f4bc8b036b84d (patch)
tree6c02d31ceebefd2ea55b2ca188685aa8d8c058d7 /src/runtime
parent49fb52997fba9f2daa48677a2084852b0c9d94a8 (diff)
downloadgo-9400d916b5332a746dacd8398c8f4bc8b036b84d.tar.gz
[dev.cc] runtime: fix nil pointer crash handler bug on Solaris
This change fixes the Solaris port. LGTM=dave, rsc R=rsc, dave CC=brad, golang-codereviews https://codereview.appspot.com/168600045
Diffstat (limited to 'src/runtime')
-rw-r--r--src/runtime/signal_solaris_amd64.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/signal_solaris_amd64.go b/src/runtime/signal_solaris_amd64.go
index 967835ad2..a577c8c19 100644
--- a/src/runtime/signal_solaris_amd64.go
+++ b/src/runtime/signal_solaris_amd64.go
@@ -36,7 +36,7 @@ func (c *sigctxt) cs() uint64 { return uint64(c.regs().gregs[_REG_CS]) }
func (c *sigctxt) fs() uint64 { return uint64(c.regs().gregs[_REG_FS]) }
func (c *sigctxt) gs() uint64 { return uint64(c.regs().gregs[_REG_GS]) }
func (c *sigctxt) sigcode() uint64 { return uint64(c.info.si_code) }
-func (c *sigctxt) sigaddr() uint64 { return uint64(uintptr(unsafe.Pointer(&c.info.__data[0]))) }
+func (c *sigctxt) sigaddr() uint64 { return *(*uint64)(unsafe.Pointer(&c.info.__data[0])) }
func (c *sigctxt) set_rip(x uint64) { c.regs().gregs[_REG_RIP] = int64(x) }
func (c *sigctxt) set_rsp(x uint64) { c.regs().gregs[_REG_RSP] = int64(x) }