Merge pull request #3588 from NatKarmios/notes-error-catch

Fix error when the notes plugin receives a non-string message
hakimel · Mar 15, 2024 · d4e5c39 · d4e5c39
2 parents 488c5c8 + 2fb4b46
commit d4e5c39
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/plugin/notes/notes.esm.js b/plugin/notes/notes.esm.js
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
diff --git a/plugin/notes/plugin.js b/plugin/notes/plugin.js
@@ -180,14 +180,16 @@ const Plugin = () => {
 		// (added 12/5/22 as a XSS safeguard)
 		if( isSameOriginEvent( event ) ) {
 
-			let data = JSON.parse( event.data );
-			if( data && data.namespace === 'reveal-notes' && data.type === 'connected' ) {
-				clearInterval( connectInterval );
-				onConnected();
-			}
-			else if( data && data.namespace === 'reveal-notes' && data.type === 'call' ) {
-				callRevealApi( data.methodName, data.arguments, data.callId );
-			}
+			try {
+				let data = JSON.parse( event.data );
+				if( data && data.namespace === 'reveal-notes' && data.type === 'connected' ) {
+					clearInterval( connectInterval );
+					onConnected();
+				}
+				else if( data && data.namespace === 'reveal-notes' && data.type === 'call' ) {
+					callRevealApi( data.methodName, data.arguments, data.callId );
+				}
+		  } catch (e) {}
 
 		}