fix

ampproject · May 30, 2017 · 9b3e477 · 9b3e477
1 parent 83a10ec
commit 9b3e477
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/extensions/amp-viewer-integration/0.1/messaging/messaging.js b/extensions/amp-viewer-integration/0.1/messaging/messaging.js
@@ -55,7 +55,13 @@ export function parseMessage(message) {
   if (message.charAt(0) != '{') {
     return null;
   }
-  return /** @type {?Message} */ (JSON.parse(/** @type {string} */ (message)));
+
+  try {
+    return /** @type {?Message} */ (
+      JSON.parse(/** @type {string} */ (message)));
+  } catch (e) {
+    return null;
+  }
 }
 
 

diff --git a/extensions/amp-viewer-integration/0.1/test/test-amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/test/test-amp-viewer-integration.js
@@ -19,8 +19,8 @@ import {
   Messaging,
   WindowPortEmulator,
   parseMessage,
-} from '../messaging/messaging.js';
-import {ViewerForTesting} from './viewer-for-testing.js';
+} from '../messaging/messaging';
+import {ViewerForTesting} from './viewer-for-testing';
 import {getSourceUrl} from '../../../../src/url';