From 09367c0d60f551d7d05b6212b649a71636b623ce Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 25 Oct 2011 16:35:24 +0000 Subject: [PATCH] Don't permit close of receive-only channel. Better panic on attempt to close nil channel. From-SVN: r180437 --- gcc/go/gofrontend/expressions.cc | 2 ++ libgo/runtime/go-close.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 180279efac6..cdf2bad09f3 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -8153,6 +8153,8 @@ Builtin_call_expression::do_check_types(Gogo*) { if (this->one_arg()->type()->channel_type() == NULL) this->report_error(_("argument must be channel")); + else if (!this->one_arg()->type()->channel_type()->may_send()) + this->report_error(_("cannot close receive-only channel")); } break; diff --git a/libgo/runtime/go-close.c b/libgo/runtime/go-close.c index 44533ebe4c7..778eab3d7d8 100644 --- a/libgo/runtime/go-close.c +++ b/libgo/runtime/go-close.c @@ -16,6 +16,9 @@ __go_builtin_close (struct __go_channel *channel) { int i; + if (channel == NULL) + __go_panic_msg ("close of nil channel"); + i = pthread_mutex_lock (&channel->lock); __go_assert (i == 0);