From a67c8181fcf2b4db1c4a33ad6f9e3be056afaea1 Mon Sep 17 00:00:00 2001
From: EYHN <cneyhn@gmail.com>
Date: Mon, 25 Dec 2023 06:58:11 +0000
Subject: [PATCH] fix(workspace): fix svg file with xml header (#5388)

---
 .../utils/__tests__/buffer-to-blob.spec.ts    |  5 +++++
 .../workspace/src/utils/buffer-to-blob.ts     | 21 +++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/workspace/src/utils/__tests__/buffer-to-blob.spec.ts b/packages/frontend/workspace/src/utils/__tests__/buffer-to-blob.spec.ts
index 1aa471b055..8c474966d5 100644
--- a/packages/frontend/workspace/src/utils/__tests__/buffer-to-blob.spec.ts
+++ b/packages/frontend/workspace/src/utils/__tests__/buffer-to-blob.spec.ts
@@ -9,5 +9,10 @@ describe('isSvgBuffer', () => {
     expect(isSvgBuffer(Buffer.from('<svg></svg>'))).toBe(true);
     expect(isSvgBuffer(Buffer.from(' \n\r\t<svg></svg>'))).toBe(true);
     expect(isSvgBuffer(Buffer.from('<123>'))).toBe(false);
+    expect(
+      isSvgBuffer(
+        Buffer.from('<?xml version="1.0" encoding="UTF-8"?><svg></svg>')
+      )
+    ).toBe(true);
   });
 });
diff --git a/packages/frontend/workspace/src/utils/buffer-to-blob.ts b/packages/frontend/workspace/src/utils/buffer-to-blob.ts
index 2ff1d9e1e7..2d642233fb 100644
--- a/packages/frontend/workspace/src/utils/buffer-to-blob.ts
+++ b/packages/frontend/workspace/src/utils/buffer-to-blob.ts
@@ -1,7 +1,7 @@
 import isSvg from 'is-svg';
 
 function fastCheckIsNotSvg(buffer: Uint8Array) {
-  // check first non-whitespace character is not '<svg'
+  // check first non-whitespace character is not '<svg' or '<?xml'
   for (let i = 0; i < buffer.length; i++) {
     const ch = buffer[i];
 
@@ -18,11 +18,20 @@ function fastCheckIsNotSvg(buffer: Uint8Array) {
       continue;
     }
 
-    return !(
-      buffer[i] === /* '<' */ 0x3c &&
-      buffer[i + 1] === /* 's' */ 0x73 &&
-      buffer[i + 2] === /* 'v' */ 0x76 &&
-      buffer[i + 3] === /* 'g' */ 0x67
+    return (
+      !(
+        buffer[i] === /* '<' */ 0x3c &&
+        buffer[i + 1] === /* 's' */ 0x73 &&
+        buffer[i + 2] === /* 'v' */ 0x76 &&
+        buffer[i + 3] === /* 'g' */ 0x67
+      ) &&
+      !(
+        buffer[i] === /* '<' */ 0x3c &&
+        buffer[i + 1] === /* '?' */ 0x3f &&
+        buffer[i + 2] === /* 'x' */ 0x78 &&
+        buffer[i + 3] === /* 'm' */ 0x6d &&
+        buffer[i + 4] === /* 'l' */ 0x6c
+      )
     );
   }