Merge pull request #15 from opendesigndev/bugfix/invalid-signature-2

catch on invalid signature
webtoon · Jan 26, 2023 · d4b8e99 · d4b8e99
2 parents 0ced991 + 22415a7
commit d4b8e99
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/packages/psd/src/sections/LayerAndMaskInformation/readLayerRecordsAndChannels.ts b/packages/psd/src/sections/LayerAndMaskInformation/readLayerRecordsAndChannels.ts
@@ -20,6 +20,7 @@ import {parseEngineData, validateSupportedCompression} from "../../methods";
 import {
   Cursor,
   height,
+  InvalidAdditionalLayerInfoSignature,
   InvalidBlendingModeSignature,
   MissingRealMaskData,
 } from "../../utils";
@@ -142,7 +143,17 @@ function readLayerRecord(
 
   const additionalLayerInfos: AdditionalLayerInfo[] = [];
   while (cursor.position - layerExtraDataBegin < layerExtraDataSize) {
-    additionalLayerInfos.push(readAdditionalLayerInfo(cursor, fileVersionSpec));
+    try {
+      additionalLayerInfos.push(
+        readAdditionalLayerInfo(cursor, fileVersionSpec)
+      );
+    } catch (error) {
+      if (error instanceof InvalidAdditionalLayerInfoSignature) {
+        cursor.unpass(4);
+        break;
+      }
+      throw error;
+    }
   }
 
   // Extract useful information from additionalLayerInfos and expose them as
@@ -206,9 +217,17 @@ export function readGlobalAdditionalLayerInformation(
 ): AdditionalLayerProperties {
   const additionalLayerInfos = [];
   while (cursor.position < cursor.length) {
-    additionalLayerInfos.push(
-      readAdditionalLayerInfo(cursor, fileVersionSpec, /* padding */ 4)
-    );
+    try {
+      additionalLayerInfos.push(
+        readAdditionalLayerInfo(cursor, fileVersionSpec, /* padding */ 4)
+      );
+    } catch (error) {
+      if (error instanceof InvalidAdditionalLayerInfoSignature) {
+        cursor.unpass(4);
+        break;
+      }
+      throw error;
+    }
   }
 
   return fromEntries(