From: Aram Hăvărneanu <aram@mgk.ro>
Date: Fri, 14 Nov 2014 13:25:49 +0000 (+0100)
Subject: [dev.cc] runtime: fix nil pointer crash handler bug on Solaris
X-Git-Tag: go1.5beta1~2688^2~52
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9d6825edee770f856cfdabb9e87c1a13e6feb4c8;p=gostls13.git

[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://golang.org/cl/168600045
---

diff --git a/src/runtime/signal_solaris_amd64.go b/src/runtime/signal_solaris_amd64.go
index 967835ad2c..a577c8c199 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) }