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

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-06-19 20:06:58 +01:00
parent 3fdb2b3c85 814e90805e
commit c12f8298e6
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View File

@ -381,15 +381,15 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
int read = (this.headerStream != null ? this.headerStream.read(b, off, len) int read = (this.headerStream != null ? this.headerStream.read(b, off, len)
: -1); : -1);
if (read > 0) { if (read <= 0) {
this.position += read; return readRemainder(b, off, len);
}
else {
read = 0;
} }
this.position += read;
if (read < len) { if (read < len) {
read += super.read(b, off + read, len - read); int remainderRead = readRemainder(b, off + read, len - read);
this.position += read; if (remainderRead > 0) {
read += remainderRead;
}
} }
if (this.position >= this.headerLength) { if (this.position >= this.headerLength) {
this.headerStream = null; this.headerStream = null;
@ -401,6 +401,14 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
return Arrays.equals(this.header, ZIP_HEADER); return Arrays.equals(this.header, ZIP_HEADER);
} }
private int readRemainder(byte[] b, int off, int len) throws IOException {
int read = super.read(b, off, len);
if (read > 0) {
this.position += read;
}
return read;
}
} }
/** /**

32
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/ZipHeaderPeekInputStreamTests.java
View File

@ -100,4 +100,36 @@ public class ZipHeaderPeekInputStreamTests {
} }
} }
@Test
public void readMoreThanEntireStreamWhenStreamLengthIsLessThanZipHeaderLength()
throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
new ByteArrayInputStream(new byte[] { 10 }))) {
byte[] bytes = new byte[8];
assertThat(in.read(bytes)).isEqualTo(1);
assertThat(bytes).containsExactly(10, 0, 0, 0, 0, 0, 0, 0);
}
}
@Test
public void readMoreThanEntireStreamWhenStreamLengthIsSameAsHeaderLength()
throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
new ByteArrayInputStream(new byte[] { 1, 2, 3, 4 }))) {
byte[] bytes = new byte[8];
assertThat(in.read(bytes)).isEqualTo(4);
assertThat(bytes).containsExactly(1, 2, 3, 4, 0, 0, 0, 0);
}
}
@Test
public void readMoreThanEntireStreamWhenStreamLengthIsZero() throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
new ByteArrayInputStream(new byte[0]))) {
byte[] bytes = new byte[8];
assertThat(in.read(bytes)).isEqualTo(-1);
assertThat(bytes).containsExactly(0, 0, 0, 0, 0, 0, 0, 0);
}
}
} }