qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 10:00:25 -07:00
Code Releases Activity

runtime: allow for C pointers between arena_start and arena_used in cgo check

Browse Source 
Fixes #13928.

Change-Id: Ia04c6bdef5ae6924d03982682ee195048f8f387f
Reviewed-on: https://go-review.googlesource.com/18611
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Russ Cox 2016-01-13 12:23:44 -05:00
parent 166cfd2c87
commit dd6753a6f2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime/cgocall.go
View File

@ -502,11 +502,13 @@ func cgoCheckArg(t *_type, p unsafe.Pointer, indir, top bool, msg string) {
func cgoCheckUnknownPointer(p unsafe.Pointer, msg string) (base, i uintptr) {
if cgoInRange(p, mheap_.arena_start, mheap_.arena_used) {
if !inheap(uintptr(p)) {
// This pointer is either to a stack or to an
// unused span. Escape analysis should
// prevent the former and the latter should
// not happen.
panic(errorString("cgo argument has invalid Go pointer"))
// On 32-bit systems it is possible for C's allocated memory
// to have addresses between arena_start and arena_used.
// Either this pointer is a stack or an unused span or it's
// a C allocation. Escape analysis should prevent the first,
// garbage collection should prevent the second,
// and the third is completely OK.
return
}
b, hbits, span := heapBitsForObject(uintptr(p), 0, 0)