fix: Handle invalid dataURL or InvalidCharacterException

frappe · Jan 24, 2025 · f61d240 · f61d240
1 parent 8c6a098
commit f61d240
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/frontend/src/utils/block.ts b/frontend/src/utils/block.ts
@@ -112,12 +112,14 @@ class Block implements BlockOptions {
 			// if src is base64, convert it to a file
 			const src = this.getAttribute("src") as string;
 			if (src && src.startsWith("data:image")) {
-				this.setAttribute("src", "");
-				options.src = "";
 				const file = dataURLtoFile(src, "image.png");
-				uploadImage(file, true).then((obj) => {
-					this.setAttribute("src", obj.fileURL);
-				});
+				if (file) {
+					this.setAttribute("src", "");
+					options.src = "";
+					uploadImage(file, true).then((obj) => {
+						this.setAttribute("src", obj.fileURL);
+					});
+				}
 			}
 		}
 	}

diff --git a/frontend/src/utils/helpers.ts b/frontend/src/utils/helpers.ts
@@ -383,15 +383,20 @@ async function uploadImage(file: File, silent = false) {
 }
 
 function dataURLtoFile(dataurl: string, filename: string) {
-	let arr = dataurl.split(","),
-		mime = arr[0].match(/:(.*?);/)?.[1],
-		bstr = atob(arr[1]),
-		n = bstr.length,
-		u8arr = new Uint8Array(n);
-	while (n--) {
-		u8arr[n] = bstr.charCodeAt(n);
+	try {
+		let arr = dataurl.split(","),
+			mime = arr[0].match(/:(.*?);/)?.[1],
+			bstr = atob(arr[1]),
+			n = bstr.length,
+			u8arr = new Uint8Array(n);
+		while (n--) {
+			u8arr[n] = bstr.charCodeAt(n);
+		}
+		return new File([u8arr], filename, { type: mime });
+	} catch (error) {
+		console.error(`Failed to convert dataURL ${dataurl} to file.`);
+		return null;
 	}
-	return new File([u8arr], filename, { type: mime });
 }
 
 declare global {