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

8320971: Use BufferedInputStream.buf directly when param of implTransferTo() is trusted

Browse source 
Reviewed-by: alanb, bpb
This commit is contained in:
Sergey Tsypanov 2024-01-02 20:05:31 +00:00 • committed by Brian Burkhalter
parent 51238c4bdb
commit 38042ad4e9
2 changed files with 114 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/java.base/share/classes/java/io/BufferedInputStream.java
View file

@ -643,9 +643,13 @@ public class BufferedInputStream extends FilterInputStream {
if (getClass() == BufferedInputStream.class && markpos == -1) {
int avail = count - pos;
if (avail > 0) {
// Prevent poisoning and leaking of buf
byte[] buffer = Arrays.copyOfRange(getBufIfOpen(), pos, count);
out.write(buffer);
if (isTrusted(out)) {
out.write(getBufIfOpen(), pos, count);
} else {
// Prevent poisoning and leaking of buf
byte[] buffer = Arrays.copyOfRange(getBufIfOpen(), pos, count);
out.write(buffer);
}
pos = count;
}
try {
@ -658,4 +662,22 @@ public class BufferedInputStream extends FilterInputStream {
}
}
/**
* Returns true if this class satisfies the following conditions:
* <ul>
* <li>does not retain a reference to the {@code byte[]}</li>
* <li>does not leak a reference to the {@code byte[]} to non-trusted classes</li>
* <li>does not modify the contents of the {@code byte[]}</li>
* <li>{@code write()} method does not read the contents outside of the offset/length bounds</li>
* </ul>
*
* @return true if this class is trusted
*/
private static boolean isTrusted(OutputStream os) {
var clazz = os.getClass();
return clazz == ByteArrayOutputStream.class
|| clazz == FileOutputStream.class
|| clazz == PipedOutputStream.class;
}
}