From 4815192e5416450acf40f3ba3eabe84f208349bd Mon Sep 17 00:00:00 2001 From: duke Date: Wed, 4 Oct 2023 16:48:12 +0000 Subject: [PATCH] Backport 5cacf212f066f5694d01f0891adfbe8b38660175 --- .../classes/java/io/ByteArrayInputStream.java | 13 +++- .../ChunkedTransferTo.java | 72 +++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java diff --git a/src/java.base/share/classes/java/io/ByteArrayInputStream.java b/src/java.base/share/classes/java/io/ByteArrayInputStream.java index 08a3ec982d1..e3e755361b6 100644 --- a/src/java.base/share/classes/java/io/ByteArrayInputStream.java +++ b/src/java.base/share/classes/java/io/ByteArrayInputStream.java @@ -44,6 +44,7 @@ * @since 1.0 */ public class ByteArrayInputStream extends InputStream { + private static final int MAX_TRANSFER_SIZE = 128*1024; /** * An array of bytes that was provided @@ -205,8 +206,16 @@ public int readNBytes(byte[] b, int off, int len) { @Override public synchronized long transferTo(OutputStream out) throws IOException { int len = count - pos; - out.write(buf, pos, len); - pos = count; + if (len > 0) { + int nwritten = 0; + while (nwritten < len) { + int nbyte = Integer.min(len - nwritten, MAX_TRANSFER_SIZE); + out.write(buf, pos, nbyte); + pos += nbyte; + nwritten += nbyte; + } + assert pos == count; + } return len; } diff --git a/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java b/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java new file mode 100644 index 00000000000..fc334dd7804 --- /dev/null +++ b/test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 8316156 + * @summary Ensure ByteArrayInputStream.transferTo does not cause direct memory + * to overflow MaxDirectMemorySize + * @run junit/othervm -XX:MaxDirectMemorySize=5M ChunkedTransferTo + */ + +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.channels.Channels; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Random; + +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static java.nio.file.StandardOpenOption.*; + +import org.junit.jupiter.api.Test; + +public class ChunkedTransferTo { + // this value must exceed MaxDirectMemorySize + private static final int SIZE = 10_000_000; + + @Test + public void byteArrayInputStream() throws IOException { + byte[] src = new byte[SIZE]; + Random rnd = new Random(System.nanoTime()); + rnd.nextBytes(src); + try (ByteArrayInputStream bais = new ByteArrayInputStream(src)) { + Path target = Files.createTempFile("SNA", "FU"); + FileChannel fc = FileChannel.open(target, CREATE, WRITE); + bais.transferTo(Channels.newOutputStream(fc)); + byte[] dst = new byte[SIZE + 1]; + try (FileInputStream fis = new FileInputStream(target.toFile())) { + int n = -1; + if ((n = fis.read(dst)) != SIZE) + throw new RuntimeException(n + " != " + SIZE); + } + Files.delete(target); + if (!Arrays.equals(src, 0, SIZE, dst, 0, SIZE)) + throw new RuntimeException("Arrays are not equal"); + } catch (OutOfMemoryError oome) { + throw new RuntimeException(oome); + } + } +}