diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-20 11:48:08 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-20 11:48:08 -0500 |
| commit | 4a674f45d109048fcef7cd9f2b876e270625c8ed (patch) | |
| tree | 3015eab80ef343dda34fb968843c8b2d28987f05 /src/runtime/chan.go | |
| parent | fbd764146d71d8929edadc4abd51e89932742000 (diff) | |
| parent | 1ac4b754e58ba42944de03808fb96210b065e4c4 (diff) | |
| download | go-4a674f45d109048fcef7cd9f2b876e270625c8ed.tar.gz | |
[dev.cc] all: merge default (e4ab8f908aac) into dev.cc
TBR=austin
CC=golang-codereviews
https://codereview.appspot.com/179040044
Diffstat (limited to 'src/runtime/chan.go')
| -rw-r--r-- | src/runtime/chan.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/chan.go b/src/runtime/chan.go index 0eb87df74..330422ad0 100644 --- a/src/runtime/chan.go +++ b/src/runtime/chan.go @@ -26,7 +26,7 @@ func makechan(t *chantype, size int64) *hchan { if hchanSize%maxAlign != 0 || elem.align > maxAlign { gothrow("makechan: bad alignment") } - if size < 0 || int64(uintptr(size)) != size || (elem.size > 0 && uintptr(size) > (maxmem-hchanSize)/uintptr(elem.size)) { + if size < 0 || int64(uintptr(size)) != size || (elem.size > 0 && uintptr(size) > (_MaxMem-hchanSize)/uintptr(elem.size)) { panic("makechan: size out of range") } |