loleaflet/src/map/handler/Map.WOPI.js |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 584352dae438307ab3aa4805347c7c5ad5fc32da
Author:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed May 22 13:13:10 2019 +0200
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed May 22 15:56:08 2019 +0200

    PostMessage: Catch parsing errors
    
    Change-Id: I844086c8641da5228e7dc817451456f0958be2a6
    Reviewed-on: https://gerrit.libreoffice.org/72759
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 4975fb691..5367450e7 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -140,7 +140,14 @@ L.Map.WOPI = L.Handler.extend({
                        return;
                }
 
-               var msg = JSON.parse(e.data);
+               var msg;
+               try {
+                       msg = JSON.parse(e.data);
+               } catch (e) {
+                       console.error(e);
+                       return;
+               }
+
                if (msg.MessageId === 'Host_PostmessageReady') {
                        // We already have a listener for this in 
loleaflet.html, so ignore it here
                        return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to