diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-28 21:53:31 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-28 21:53:31 -0400 |
| commit | 8fcdc70c5ebf9c8d160b85e9402e7db5f4bf0793 (patch) | |
| tree | 8cadab21060a7e9cc7b79b10aea00ced0ec2c34e /src/runtime/stack.c | |
| parent | c4efaac15daac5e15092532dcc7ca9c30a0e0fbc (diff) | |
| download | go-8fcdc70c5ebf9c8d160b85e9402e7db5f4bf0793.tar.xz | |
runtime: add GODEBUG invalidptr setting
Fixes #8861.
Fixes #8911.
LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/165780043
Diffstat (limited to 'src/runtime/stack.c')
| -rw-r--r-- | src/runtime/stack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/stack.c b/src/runtime/stack.c index e402691f45..ed8f4f8727 100644 --- a/src/runtime/stack.c +++ b/src/runtime/stack.c @@ -401,12 +401,12 @@ adjustpointers(byte **scanp, BitVector *bv, AdjustInfo *adjinfo, Func *f) break; case BitsPointer: p = scanp[i]; - if(f != nil && (byte*)0 < p && (p < (byte*)PageSize || (uintptr)p == PoisonGC || (uintptr)p == PoisonStack)) { + if(f != nil && (byte*)0 < p && (p < (byte*)PageSize && runtime·invalidptr || (uintptr)p == PoisonGC || (uintptr)p == PoisonStack)) { // Looks like a junk value in a pointer slot. // Live analysis wrong? g->m->traceback = 2; runtime·printf("runtime: bad pointer in frame %s at %p: %p\n", runtime·funcname(f), &scanp[i], p); - runtime·throw("bad pointer!"); + runtime·throw("invalid stack pointer"); } if(minp <= p && p < maxp) { if(StackDebug >= 3) |