From d6d6c749ea708e0be85fdb685192234e402050d9 Mon Sep 17 00:00:00 2001 From: Chris Rhodes Date: Thu, 21 Jan 2016 11:11:18 -0800 Subject: [PATCH] Prevent listen from reading from nulled out web socket. --- wsapi.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wsapi.go b/wsapi.go index 51432a3..0199f13 100644 --- a/wsapi.go +++ b/wsapi.go @@ -73,7 +73,7 @@ func (s *Session) Open() (err error) { // Create listening outside of listen, as it needs to happen inside the mutex // lock. s.listening = make(chan interface{}) - go s.listen(s.listening) + go s.listen(s.wsConn, s.listening) s.Unlock() @@ -112,9 +112,9 @@ func (s *Session) Close() (err error) { // listen polls the websocket connection for events, it will stop when // the listening channel is closed, or an error occurs. -func (s *Session) listen(listening <-chan interface{}) { +func (s *Session) listen(wsConn *websocket.Conn, listening <-chan interface{}) { for { - messageType, message, err := s.wsConn.ReadMessage() + messageType, message, err := wsConn.ReadMessage() if err != nil { // There has been an error reading, Close() the websocket so that // OnDisconnect is fired.