put try/catch around JSON.parse calls

greggman · Oct 27, 2014 · 66b83b8 · 66b83b8
1 parent 9ab5bc4
commit 66b83b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/public/hft/0.x.x/scripts/virtualsocket.js b/public/hft/0.x.x/scripts/virtualsocket.js
@@ -98,7 +98,14 @@ define(function() {
             sendLowLevel('P');
             return;
           }
-          fn(JSON.parse(event.data));
+          try {
+            var obj = JSON.parse(event.data);
+          } catch (e) {
+            console.log(e);
+          }
+          if (obj) {
+            fn(obj);
+          }
         };
         break;
       }

diff --git a/server/websocketserver.js b/server/websocketserver.js
@@ -93,7 +93,11 @@ var WSServer = function(server) {
               return;
             }
             if (origFn) {
-              origFn(JSON.parse(data));
+              try {
+                origFn(JSON.parse(data));
+              } catch (e) {
+                console.error(e);
+              }
             }
           };
         }(fn);