summaryrefslogtreecommitdiff
path: root/libgo/runtime/go-new-channel.c
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-09-24 07:38:19 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-09-24 07:38:19 +0000
commitb7459437aef76ee975ddd0e969077c7c1c77aa13 (patch)
tree3d61b51956e0e99640086b8707875344e2e74bbc /libgo/runtime/go-new-channel.c
parentaca21847a28e296d86dae8f53863487378926c6d (diff)
downloadgcc-b7459437aef76ee975ddd0e969077c7c1c77aa13.tar.gz
2011-09-24 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 179138 using svnmerge. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@179139 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/runtime/go-new-channel.c')
-rw-r--r--libgo/runtime/go-new-channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/runtime/go-new-channel.c b/libgo/runtime/go-new-channel.c
index 0c6f39185de..2f5bf2ea20a 100644
--- a/libgo/runtime/go-new-channel.c
+++ b/libgo/runtime/go-new-channel.c
@@ -33,7 +33,7 @@ __go_new_channel (const struct __go_type_descriptor *channel_type,
ientries = (int) entries;
if (ientries < 0
|| (uintptr_t) ientries != entries
- || entries > (uintptr_t) -1 / element_size)
+ || (element_size > 0 && entries > (uintptr_t) -1 / element_size))
__go_panic_msg ("chan size out of range");
alloc_size = (element_size + sizeof (uint64_t) - 1) / sizeof (uint64_t);