From 8506fd0c4bf777e650793382341e5260a29a0404 Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Thu, 24 Jul 2014 14:46:04 +0100
Subject: [PATCH] Do not crash on malformed json message on websocket.

---
 red/comms.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/red/comms.js b/red/comms.js
index f16ba6f5a..be23729a6 100644
--- a/red/comms.js
+++ b/red/comms.js
@@ -50,7 +50,13 @@ function start() {
             }
         });
         ws.on('message', function(data,flags) {
-            var msg = JSON.parse(data);
+            var msg = null;
+            try {
+                msg = JSON.parse(data);
+            } catch(err) {
+                util.log("[red:comms] received malformed message : "+err.toString());
+                return;
+            }
             if (msg.subscribe) {
                 handleRemoteSubscription(ws,msg.subscribe);
             }