Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-23 00:00:05 -04:00
Code Issues Projects Releases Wiki Activity

#860: Fix regression in reading broken PackBits stream.

Browse Source
This commit is contained in:
Harald Kuhr
2023-11-07 14:04:28 +01:00
parent 9f4b09fc7d
commit a95235b422
4 changed files with 145 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/common-io/src/main/java/com/twelvemonkeys/io/SubStream.java
+6 -5
View File
@@ -54,7 +54,7 @@ public final class SubStream extends FilterInputStream {
*/
public SubStream(final InputStream stream, final long length) {
super(Validate.notNull(stream, "stream"));
bytesLeft = length;
bytesLeft = Validate.isTrue(length >= 0, length, "length < 0: %s");
}
/**
@@ -63,10 +63,11 @@ public final class SubStream extends FilterInputStream {
*/
@Override
public void close() throws IOException {
// NOTE: Do not close the underlying stream
// NOTE: Do not close the underlying stream, but consume it
while (bytesLeft > 0) {
//noinspection ResultOfMethodCallIgnored
skip(bytesLeft);
if (skip(bytesLeft) <= 0 && read() < 0) {
break;
}
}
}
@@ -115,7 +116,7 @@ public final class SubStream extends FilterInputStream {
@Override
public long skip(long length) throws IOException {
long skipped = super.skip(findMaxLen(length));// Skips 0 or more, never -1
long skipped = super.skip(findMaxLen(length)); // Skips 0 or more, never -1
bytesLeft -= skipped;
return skipped;