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

8321053: Use ByteArrayInputStream.buf directly when parameter of transferTo() is trusted

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2023-12-05 19:41:12 +00:00
parent acaf2c8dcf
commit b0d145097c
2 changed files with 108 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/share/classes/java/io/ByteArrayInputStream.java
View file

@ -207,10 +207,25 @@ public class ByteArrayInputStream extends InputStream {
public synchronized long transferTo(OutputStream out) throws IOException {
int len = count - pos;
if (len > 0) {
// 'tmpbuf' is null if and only if 'out' is trusted
byte[] tmpbuf;
Class<?> outClass = out.getClass();
if (outClass == ByteArrayOutputStream.class ||
outClass == FileOutputStream.class ||
outClass == PipedOutputStream.class)
tmpbuf = null;
else
tmpbuf = new byte[Integer.min(len, MAX_TRANSFER_SIZE)];
int nwritten = 0;
while (nwritten < len) {
int nbyte = Integer.min(len - nwritten, MAX_TRANSFER_SIZE);
out.write(buf, pos, nbyte);
// if 'out' is not trusted, transfer via a temporary buffer
if (tmpbuf != null) {
System.arraycopy(buf, pos, tmpbuf, 0, nbyte);
out.write(tmpbuf, 0, nbyte);
} else
out.write(buf, pos, nbyte);
pos += nbyte;
nwritten += nbyte;
}