Add support for entries larger than 2GB (Closes #14)

stephenc · stephenc · commit 6cd9621b0b76 · 2021-01-20T10:00:00.000Z
diff --git a/iso9660-ant-tasks/pom.xml b/iso9660-ant-tasks/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>java-iso-tools-parent</artifactId>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>iso9660-writer</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/iso9660-maven-plugin/pom.xml b/iso9660-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
         <artifactId>java-iso-tools-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>iso9660-maven-plugin</artifactId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>iso9660-writer</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
diff --git a/iso9660-vfs-impl/pom.xml b/iso9660-vfs-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
         <artifactId>java-iso-tools-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>iso9660-vfs-impl</artifactId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>loop-fs-iso-impl</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/iso9660-writer/pom.xml b/iso9660-writer/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
         <artifactId>java-iso-tools-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>iso9660-writer</artifactId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>sabre</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>iso9660-vfs-impl</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/loop-fs-api/pom.xml b/loop-fs-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>java-iso-tools-parent</artifactId>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/loop-fs-iso-impl/pom.xml b/loop-fs-iso-impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>java-iso-tools-parent</artifactId>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>loop-fs-spi</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/EntryInputStream.java b/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/EntryInputStream.java
@@ -33,16 +33,16 @@ class EntryInputStream extends InputStream {
     private Iso9660FileSystem fileSystem;
 
     // current position within entry data
-    private int pos;
+    private long pos;
 
     // number of remaining bytes within entry
-    private int rem;
+    private long rem;
 
     EntryInputStream(final Iso9660FileEntry entry, final Iso9660FileSystem fileSystem) {
         this.fileSystem = fileSystem;
         this.entry = entry;
         this.pos = 0;
-        this.rem = (int) entry.getSize();
+        this.rem = entry.getSize();
     }
 
     public int read(final byte b[], final int off, final int len) throws IOException {
@@ -58,7 +58,8 @@ public int read(final byte b[], final int off, final int len) throws IOException
         int toRead = len;
 
         if (toRead > this.rem) {
-            toRead = this.rem;
+            // down cast is safe as toRead is int and greater than this.rem
+            toRead = (int)this.rem;
         }
 
         int read;
@@ -94,7 +95,7 @@ public int read() throws IOException {
     public long skip(final long n) {
         ensureOpen();
 
-        final int len = (n > this.rem) ? this.rem : (int) n;
+        final long len = (n > this.rem) ? this.rem : n;
 
         this.pos += len;
         this.rem -= len;
@@ -107,13 +108,19 @@ public long skip(final long n) {
     }
 
     public int available() {
-        return Math.max(this.rem, 0);
+        if (this.rem > Integer.MAX_VALUE) {
+            return Integer.MAX_VALUE;
+        } else if (this.rem < 0) {
+            return 0;
+        } else {
+            return (int) this.rem;
+        }
     }
 
-    public int size() {
+    public long size() {
         ensureOpen();
 
-        return (int) this.entry.getSize();
+        return this.entry.getSize();
     }
 
     public void close() {
diff --git a/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileEntry.java b/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileEntry.java
@@ -32,7 +32,7 @@ public final class Iso9660FileEntry implements FileEntry {
     private String parentPath;
     private final int entryLength;
     private final long startSector;
-    private final int dataLength;
+    private final long dataLength;
     private final long lastModifiedTime;
     private final int flags;
     private final String identifier;
@@ -63,7 +63,7 @@ public Iso9660FileEntry(final Iso9660FileSystem fileSystem, final String parentP
         this.entryLength = Util.getUInt8(block, offset + 1);
         //this.extAttributeLength = Util.getUInt8(block, offset+2);
         this.startSector = Util.getUInt32LE(block, offset + 3);
-        this.dataLength = (int) Util.getUInt32LE(block, offset + 11);
+        this.dataLength = Util.getUInt32LE(block, offset + 11);
         this.lastModifiedTime = Util.getDateTime(block, offset + 19);
         this.flags = Util.getUInt8(block, offset + 26);
         //this.fileUnitSize = Util.getUInt8(block, offset+27);
diff --git a/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileSystem.java b/loop-fs-iso-impl/src/main/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileSystem.java
@@ -49,6 +49,9 @@ public InputStream getInputStream(Iso9660FileEntry entry) {
     }
 
     byte[] getBytes(Iso9660FileEntry entry) throws IOException {
+        if (entry.getSize() > Integer.MAX_VALUE) {
+            throw new IOException("Entry too large");
+        }
         int size = (int) entry.getSize();
 
         byte[] buf = new byte[size];
@@ -58,7 +61,7 @@ byte[] getBytes(Iso9660FileEntry entry) throws IOException {
         return buf;
     }
 
-    int readBytes(Iso9660FileEntry entry, int entryOffset, byte[] buffer, int bufferOffset, int len)
+    int readBytes(Iso9660FileEntry entry, long entryOffset, byte[] buffer, int bufferOffset, int len)
             throws IOException {
         long startPos = (entry.getStartBlock() * Constants.DEFAULT_BLOCK_SIZE) + entryOffset;
         return readData(startPos, buffer, bufferOffset, len);
diff --git a/loop-fs-iso-impl/src/test/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileSystemTest.java b/loop-fs-iso-impl/src/test/java/com/github/stephenc/javaisotools/loopfs/iso9660/Iso9660FileSystemTest.java
@@ -101,7 +101,7 @@ private void runCheck(Iso9660FileSystem image) throws Exception {
             File sourceFile = new File(source, entry.getPath());
             assertThat(sourceFile.isDirectory(), is(entry.isDirectory()));
             if (!sourceFile.isDirectory()) {
-                assertThat(sourceFile.length(), is(entry.getSize() * 1L));
+                assertThat(sourceFile.length(), is(entry.getSize()));
                 assertThat("contents are equal",
                         IOUtil.contentEquals(image.getInputStream(entry), new FileInputStream(sourceFile)), is(true));
             }
diff --git a/loop-fs-spi/pom.xml b/loop-fs-spi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>java-iso-tools-parent</artifactId>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>loop-fs-api</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
diff --git a/loop-fs-udf-impl/pom.xml b/loop-fs-udf-impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>java-iso-tools-parent</artifactId>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.github.stephenc.java-iso-tools</groupId>
             <artifactId>loop-fs-spi</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>com.github.stephenc.java-iso-tools</groupId>
     <artifactId>java-iso-tools-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Java ISO9660 Tools Parent</name>
 
diff --git a/sabre/pom.xml b/sabre/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.github.stephenc.java-iso-tools</groupId>
         <artifactId>java-iso-tools-parent</artifactId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sabre</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private void runCheck(Iso9660FileSystem image) throws Exception {`
`101`	`101`	`File sourceFile = new File(source, entry.getPath());`
`102`	`102`	`assertThat(sourceFile.isDirectory(), is(entry.isDirectory()));`
`103`	`103`	`if (!sourceFile.isDirectory()) {`
`104`		`- assertThat(sourceFile.length(), is(entry.getSize() * 1L));`
	`104`	`+ assertThat(sourceFile.length(), is(entry.getSize()));`
`105`	`105`	`assertThat("contents are equal",`
`106`	`106`	`IOUtil.contentEquals(image.getInputStream(entry), new FileInputStream(sourceFile)), is(true));`
`107`	`107`	`}`