Merge pull request #4198 from cqian89/develop

SDT: fix NegativeArraySizeException when reading files recorded by SPCM64 9.90
ome · Sep 3, 2024 · 8f83c44 · 8f83c44
2 parents aaaf99d + 0e842f9
commit 8f83c44
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/formats-gpl/src/loci/formats/in/SDTInfo.java b/components/formats-gpl/src/loci/formats/in/SDTInfo.java
@@ -106,7 +106,7 @@ public class SDTInfo {
   public int setupOffs;
 
   /** Length of the setup data. */
-  public short setupLength;
+  public int setupLength;
 
   /** Offset of the first data block. */
   public int dataBlockOffs;
@@ -443,7 +443,7 @@ public SDTInfo(RandomAccessInputStream in, Hashtable meta)
     infoOffs = in.readInt();
     infoLength = in.readShort();
     setupOffs = in.readInt();
-    setupLength = in.readShort();
+    setupLength = in.readUnsignedShort();
     dataBlockOffs = in.readInt();
     noOfDataBlocks = in.readShort();
     dataBlockLength = in.readInt();