Merge pull request GoogleChromeLabs#135 from ronhe/guard-smc-parse

Wrap JSON.parse with a try...catch block.
oslego · Jun 15, 2018 · 075e820 · 075e820
2 parents 80bc3fc + 0847139
commit 075e820
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/messagechanneladapter.ts b/messagechanneladapter.ts
@@ -49,7 +49,12 @@ function hookup(
   };
 
   smc.addEventListener("message", (event: Event): void => {
-    const data = JSON.parse((event as MessageEvent).data) as Message;
+    let data = {} as Message;
+    try {
+      data = JSON.parse((event as MessageEvent).data) as Message;
+    } catch (e) {
+      return;
+    }
     if (!id) id = data.id;
     if (id !== data.id) return;
     const mcs = data.messageChannels.map(messageChannel => {