root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.5.x' 

Closes gh-47058
This commit is contained in:
Andy Wilkinson 2025-09-05 17:31:57 +01:00
parent 8d2c090af8 90cc5be79f
commit 4aa0d9dcac
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFile.java
View File

@ -706,6 +706,7 @@ public class NestedJarFile extends JarFile {
JarEntryInputStream(ZipContent.Entry entry) throws IOException { JarEntryInputStream(ZipContent.Entry entry) throws IOException {
this.uncompressedSize = entry.getUncompressedSize(); this.uncompressedSize = entry.getUncompressedSize();
this.content = entry.openContent(); this.content = entry.openContent();
this.remaining = this.uncompressedSize;
} }
@Override @Override
@ -727,9 +728,6 @@ public class NestedJarFile extends JarFile {
} }
result = count; result = count;
} }
if (this.remaining == 0) {
close();
}
return result; return result;
} }
@ -741,9 +739,6 @@ public class NestedJarFile extends JarFile {
this.pos += result; this.pos += result;
this.remaining -= result; this.remaining -= result;
} }
if (this.remaining == 0) {
close();
}
return result; return result;
} }

50
loader/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/NestedJarFileTests.java
View File

@ -431,6 +431,56 @@ class NestedJarFileTests {
.hasMessage("Content mismatch when reading security info for entry 'content' (content check)"); .hasMessage("Content mismatch when reading security info for entry 'content' (content check)");
} }
@Test
void readingToEndOfStoredContentCausesAvailableToReachZero() throws IOException {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
JarEntry entry = jar.getEntry("nested.jar");
try (InputStream input = jar.getInputStream(entry)) {
assertThat(input.available()).isGreaterThan(0);
StreamUtils.copyToByteArray(input);
assertThat(input.available()).isZero();
}
}
}
@Test
void readingToEndOfDeflatedContentCausesAvailableToReachZero() throws IOException {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
JarEntry entry = jar.getEntry("d/9.dat");
try (InputStream input = jar.getInputStream(entry)) {
assertThat(input.available()).isGreaterThan(0);
StreamUtils.copyToByteArray(input);
assertThat(input.available()).isZero();
}
}
}
@Test
void skippingBeyondEndOfStoredContentCausesAvailableToReachZero() throws IOException {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
JarEntry entry = jar.getEntry("nested.jar");
try (InputStream input = jar.getInputStream(entry)) {
assertThat(input.available()).isGreaterThan(0);
long skipped = input.skip(1000);
assertThat(skipped).isLessThan(1000);
assertThat(input.available()).isZero();
}
}
}
@Test
void skippingBeyondEndOfDeflatedContentCausesAvailableToReachZero() throws IOException {
try (NestedJarFile jar = new NestedJarFile(this.file)) {
JarEntry entry = jar.getEntry("d/9.dat");
try (InputStream input = jar.getInputStream(entry)) {
assertThat(input.available()).isGreaterThan(0);
long skipped = input.skip(1000);
assertThat(skipped).isLessThan(1000);
assertThat(input.available()).isZero();
}
}
}
private List<String> collectComments(JarFile jarFile) throws IOException { private List<String> collectComments(JarFile jarFile) throws IOException {
try (jarFile) { try (jarFile) {
List<String> comments = new ArrayList<>(); List<String> comments = new ArrayList<>();