Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8316156: ByteArrayInputStream.transferTo causes MaxDirectMemorySize o…
…verflow Reviewed-by: alanb
- Loading branch information
Brian Burkhalter
committed
Sep 20, 2023
1 parent
3461c7b
commit 5cacf21
Showing
2 changed files
with
83 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
test/jdk/java/io/ByteArrayInputStream/ChunkedTransferTo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
} | ||
} |
5cacf21
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
5cacf21
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk21u
5cacf21
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bplb the backport was successfully created on the branch bplb-backport-5cacf212 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u: