Wrap decodeURIComponent in try-catch to protect against malformed URIs

2021-05-13 10:20:27 +01:00
parent 52420feab0
commit dd04b479a1
2 changed files with 17 additions and 8 deletions
--- a/src/utils/permalinks/Permalinks.ts
+++ b/src/utils/permalinks/Permalinks.ts
@@ -346,9 +346,14 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
        return permalink;
    }

-    const m = decodeURIComponent(permalink).match(matrixLinkify.ELEMENT_URL_PATTERN);
-    if (m) {
-        return m[1];
+    try {
+        const m = decodeURIComponent(permalink).match(matrixLinkify.ELEMENT_URL_PATTERN);
+        if (m) {
+            return m[1];
+        }
+    } catch (e) {
+        // Not a valid URI
+        return permalink;
    }

    // A bit of a hack to convert permalinks of unknown origin to Element links