From: Russ Cox Date: Fri, 20 Nov 2015 19:02:33 +0000 (-0500) Subject: runtime: fix new stack barrier check X-Git-Tag: go1.6beta1~352 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cb859021d123b506541126ea0ddaed60e0f7ee32;p=gostls13.git runtime: fix new stack barrier check During a crash showing goroutine stacks of all threads (with GOTRACEBACK=crash), it can be that f == nil. Only happens on Solaris; not sure why. Change-Id: Iee2c394a0cf19fa0a24f6befbc70776b9e42d25a Reviewed-on: https://go-review.googlesource.com/17110 Reviewed-by: Austin Clements --- diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go index 8d1b758271..1743a93507 100644 --- a/src/runtime/traceback.go +++ b/src/runtime/traceback.go @@ -190,7 +190,7 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in } f := findfunc(frame.pc) - if f.entry == stackBarrierPC { + if f != nil && f.entry == stackBarrierPC { // We got caught in the middle of a stack barrier // (presumably by a signal), so stkbar may be // inconsistent with the barriers on the stack.