From 4db16faac00f6318dbc1f6d9ea179c6d4faa05bb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 20 Dec 2019 14:26:34 +0100
Subject: [PATCH] Catch href decryption errors

---
 www/common/userObject.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/common/userObject.js b/www/common/userObject.js
index 7ac1bfe88..db8e687d3 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -43,10 +43,20 @@ define([
             var c = Crypto.createEncryptor(key);
             cryptor.encrypt = function (href) {
                 // Never encrypt blob href, they are always read-only
-                if (href.slice(0,7) === '/file/#') { return href; }
-                return c.encrypt(href);
+                try {
+                    if (href.slice(0,7) === '/file/#') { return href; }
+                    return c.encrypt(href);
+                } catch (e) {
+                    return;
+                }
+            };
+            cryptor.decrypt = function (msg) {
+                try {
+                    return c.decrypt(msg);
+                } catch (e) {
+                    return;
+                }
             };
-            cryptor.decrypt = c.decrypt;
         } catch (e) {
             console.error(e);
         }