From b006cb8784b5a0083f6d9bb9fbec873049597e9d Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Tue, 16 Jul 2019 09:01:01 +0200
Subject: [PATCH] Additional ws session check before writing

Avoiding reported "invalid memory address or nil pointer dereference"
---
 messaging/websocket/session.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go
index b8c95ea88..b2117c553 100644
--- a/messaging/websocket/session.go
+++ b/messaging/websocket/session.go
@@ -219,7 +219,7 @@ func (sess *Session) writeLoop() error {
 			return
 		}
 
-		if msg != nil {
+		if msg != nil && sess.conn != nil {
 			return sess.conn.WriteMessage(websocket.TextMessage, msg)
 		}
 
@@ -236,7 +236,11 @@ func (sess *Session) writeLoop() error {
 			return
 		}
 
-		return sess.conn.WriteMessage(websocket.PingMessage, nil)
+		if sess.conn != nil {
+			return sess.conn.WriteMessage(websocket.PingMessage, nil)
+		}
+
+		return
 	}
 
 	for {