From 9d6825edee770f856cfdabb9e87c1a13e6feb4c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Fri, 14 Nov 2014 14:25:49 +0100 Subject: [PATCH] [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 --- src/runtime/signal_solaris_amd64.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) } -- 2.48.1