archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8296431: PushbackInputStream should override transferTo

Browse source 
Reviewed-by: bpb
This commit is contained in:
Markus Karg 2022-11-14 18:03:18 +00:00 • committed by Brian Burkhalter
parent e269dc03ad
commit 95b84050fc
2 changed files with 231 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java.base/share/classes/java/io/PushbackInputStream.java
View file

@ -25,6 +25,7 @@
package java.io;
import java.util.Arrays;
import java.util.Objects;
import jdk.internal.misc.InternalLock;
@ -53,6 +54,8 @@ import jdk.internal.misc.InternalLock;
* @since 1.0
*/
public class PushbackInputStream extends FilterInputStream {
// initialized to null when PushbackInputStream is sub-classed
private final InternalLock closeLock;
/**
@ -405,4 +408,23 @@ public class PushbackInputStream extends FilterInputStream {
buf = null;
}
}
@Override
public long transferTo(OutputStream out) throws IOException {
Objects.requireNonNull(out, "out");
ensureOpen();
if (getClass() == PushbackInputStream.class) {
int avail = buf.length - pos;
if (avail > 0) {
// Prevent poisoning and leaking of buf
byte[] buffer = Arrays.copyOfRange(buf, pos, buf.length);
out.write(buffer);
pos = buffer.length;
}
return avail + in.transferTo(out);
} else {
return super.transferTo(out);
}
}
}