Skip to content

Commit

Permalink
8316156: ByteArrayInputStream.transferTo causes MaxDirectMemorySize o…
Browse files Browse the repository at this point in the history
…verflow

Backport-of: 5cacf212f066f5694d01f0891adfbe8b38660175
  • Loading branch information
Brian Burkhalter committed Oct 4, 2023
1 parent e76be61 commit 834c45c
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/java.base/share/classes/java/io/ByteArrayInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
72 changes: 72 additions & 0 deletions test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
}

1 comment on commit 834c45c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.