undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
87
test/jdk/java/io/ByteArrayOutputStream/EncodingTest.java
Normal file
87
test/jdk/java/io/ByteArrayOutputStream/EncodingTest.java
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
/*
|
||||
* Copyright (c) 2017, 2026, 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.
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8183743
|
||||
* @summary Test to verify the new overload method with Charset functions the same
|
||||
* as the existing method that takes a charset name.
|
||||
* @run junit EncodingTest
|
||||
*/
|
||||
public class EncodingTest {
|
||||
/*
|
||||
* MethodSource for the toString method test. Provides the following fields:
|
||||
* byte array, charset name string, charset object
|
||||
*/
|
||||
public static Stream<Arguments> parameters() throws IOException {
|
||||
byte[] data = getData();
|
||||
return Stream.of
|
||||
(Arguments.of(data, StandardCharsets.UTF_8.name(), StandardCharsets.UTF_8),
|
||||
Arguments.of(data, StandardCharsets.ISO_8859_1.name(), StandardCharsets.ISO_8859_1));
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies that the new overload method that takes a Charset is equivalent to
|
||||
* the existing one that takes a charset name.
|
||||
* @param data a byte array
|
||||
* @param csn the charset name
|
||||
* @param charset the charset
|
||||
* @throws Exception if the test fails
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("parameters")
|
||||
public void test(byte[] data, String csn, Charset charset) throws Exception {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
baos.write(data);
|
||||
String str1 = baos.toString(csn);
|
||||
String str2 = baos.toString(charset);
|
||||
assertEquals(str2, str1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns an array containing a character that's invalid for UTF-8
|
||||
* but valid for ISO-8859-1
|
||||
*/
|
||||
static byte[] getData() throws IOException {
|
||||
String str1 = "A string that contains ";
|
||||
String str2 = " , an invalid character for UTF-8.";
|
||||
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
baos.write(str1.getBytes());
|
||||
baos.write(0xFA);
|
||||
baos.write(str2.getBytes());
|
||||
return baos.toByteArray();
|
||||
}
|
||||
}
|
||||
66
test/jdk/java/io/ByteArrayOutputStream/MaxCapacity.java
Normal file
66
test/jdk/java/io/ByteArrayOutputStream/MaxCapacity.java
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
/*
|
||||
* Copyright (c) 2014, Google Inc. All rights reserved.
|
||||
* Copyright (c) 2020, 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 8055949
|
||||
* @summary Check that we can write (almost) Integer.MAX_VALUE bytes
|
||||
* to a ByteArrayOutputStream.
|
||||
* @requires (sun.arch.data.model == "64" & os.maxMemory >= 10g)
|
||||
* @run main/timeout=1800/othervm -Xmx8g MaxCapacity
|
||||
* @author Martin Buchholz
|
||||
*/
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
public class MaxCapacity {
|
||||
public static void main(String[] args) {
|
||||
long maxHeap = Runtime.getRuntime().maxMemory();
|
||||
if (maxHeap < 3L * Integer.MAX_VALUE) {
|
||||
System.out.printf("Skipping test; max memory %sM too small%n",
|
||||
maxHeap/(1024*1024));
|
||||
return;
|
||||
}
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
for (long n = 0; ; n++) {
|
||||
try {
|
||||
baos.write((byte)'x');
|
||||
} catch (Throwable t) {
|
||||
// check data integrity while we're here
|
||||
byte[] bytes = baos.toByteArray();
|
||||
if (bytes.length != n)
|
||||
throw new AssertionError("wrong length");
|
||||
if (bytes[0] != 'x' ||
|
||||
bytes[bytes.length - 1] != 'x')
|
||||
throw new AssertionError("wrong contents");
|
||||
|
||||
long gap = Integer.MAX_VALUE - n;
|
||||
System.out.printf("gap=%dM %d%n", gap/(1024*1024), gap);
|
||||
if (gap > 1024)
|
||||
throw t;
|
||||
// t.printStackTrace();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
48
test/jdk/java/io/ByteArrayOutputStream/ToString.java
Normal file
48
test/jdk/java/io/ByteArrayOutputStream/ToString.java
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 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 1226190
|
||||
@summary Heartbeat test of ByteArrayOutputStream's toString methods
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
|
||||
public class ToString {
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String test = "This is a test.";
|
||||
ByteArrayOutputStream b = new ByteArrayOutputStream();
|
||||
PrintStream p = new PrintStream(b);
|
||||
p.print(test);
|
||||
p.close();
|
||||
|
||||
if (! b.toString().equals(test))
|
||||
throw new RuntimeException("Default encoding failed");
|
||||
if (! b.toString("UTF8").equals(test))
|
||||
throw new RuntimeException("UTF8 encoding failed");
|
||||
if (! b.toString(0).equals(test))
|
||||
throw new RuntimeException("Hibyte0 encoding failed");
|
||||
}
|
||||
|
||||
}
|
||||
130
test/jdk/java/io/ByteArrayOutputStream/Write.java
Normal file
130
test/jdk/java/io/ByteArrayOutputStream/Write.java
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2026, 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 4017158 8180410
|
||||
* @library /test/lib
|
||||
* @build jdk.test.lib.RandomFactory
|
||||
* @run junit Write
|
||||
* @summary Check for correct implementation of ByteArrayInputStream.write
|
||||
* @key randomness
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
import jdk.test.lib.RandomFactory;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
public class Write {
|
||||
private static void doBoundsTest(byte[] b, int off, int len,
|
||||
ByteArrayOutputStream baos)
|
||||
throws Exception {
|
||||
if (b != null) {
|
||||
System.err.println("ByteArrayOutStream.write: b.length = " +
|
||||
b.length + " off = " + off + " len = " + len);
|
||||
} else{
|
||||
System.err.println("ByteArrayOutStream.write: b is null off = " +
|
||||
off + " len = " + len);
|
||||
}
|
||||
|
||||
Class expectedException = (b == null)
|
||||
? NullPointerException.class : IndexOutOfBoundsException.class;
|
||||
assertThrows(expectedException, () -> baos.write(b, off, len));
|
||||
|
||||
if (b != null) {
|
||||
System.err.println("ByteArrayOutStream.writeBytes: b.length = " +
|
||||
b.length);
|
||||
} else{
|
||||
System.err.println("ByteArrayOutStream.writeBytes: b is null");
|
||||
assertThrows(NullPointerException.class, () -> baos.writeBytes(b));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void boundsTest() throws Exception {
|
||||
byte array1[] = {1 , 2 , 3 , 4 , 5}; // Simple array
|
||||
|
||||
//Create new ByteArrayOutputStream object
|
||||
ByteArrayOutputStream y1 = new ByteArrayOutputStream(5);
|
||||
|
||||
doBoundsTest(array1, 0, Integer.MAX_VALUE , y1);
|
||||
doBoundsTest(array1, 0, array1.length+100, y1);
|
||||
doBoundsTest(array1, -1, 2, y1);
|
||||
doBoundsTest(array1, 0, -1, y1);
|
||||
doBoundsTest(null, 0, 2, y1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void writeTest() throws Exception {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
Random rnd = RandomFactory.getRandom();
|
||||
final int size = 17 + rnd.nextInt(128);
|
||||
|
||||
byte[] b = new byte[size];
|
||||
rnd.nextBytes(b);
|
||||
|
||||
int off1 = rnd.nextInt(size / 4) + 1;
|
||||
int len1 = Math.min(rnd.nextInt(size / 4) + 1, size - off1);
|
||||
int off2 = rnd.nextInt(size / 2) + 1;
|
||||
int len2 = Math.min(rnd.nextInt(size / 2) + 1, size - off2);
|
||||
|
||||
System.err.format("size: %d, off1: %d, len1: %d, off2: %d, len2: %d%n",
|
||||
size, off1, len1, off2, len2);
|
||||
|
||||
baos.write(b, off1, len1);
|
||||
byte[] b1 = baos.toByteArray();
|
||||
assertEquals(len1, b1.length, "Array length test 1 failed.");
|
||||
assertArrayEquals(Arrays.copyOfRange(b, off1, off1 + len1), b1,
|
||||
"Array equality test 1 failed.");
|
||||
|
||||
baos.write(b, off2, len2);
|
||||
byte[] b2 = baos.toByteArray();
|
||||
assertEquals(len1 + len2, b2.length, "Array length test 2 failed.");
|
||||
assertArrayEquals(Arrays.copyOfRange(b, off1, off1 + len1),
|
||||
Arrays.copyOfRange(b2, 0, len1),
|
||||
"Array equality test 2A failed.");
|
||||
assertArrayEquals(Arrays.copyOfRange(b, off2, off2 + len2),
|
||||
Arrays.copyOfRange(b2, len1, len1 + len2),
|
||||
"Array equality test 2B failed.");
|
||||
|
||||
baos.writeBytes(b);
|
||||
byte[] b3 = baos.toByteArray();
|
||||
int len3 = len1 + len2 + b.length;
|
||||
assertEquals(len3, b3.length, "Array length test 3 failed.");
|
||||
assertArrayEquals(Arrays.copyOfRange(b, off1, off1 + len1),
|
||||
Arrays.copyOfRange(b3, 0, len1),
|
||||
"Array equality test 3A failed.");
|
||||
assertArrayEquals(Arrays.copyOfRange(b, off2, off2 + len2),
|
||||
Arrays.copyOfRange(b3, len1, len1 + len2),
|
||||
"Array equality test 3B failed.");
|
||||
assertArrayEquals(b, Arrays.copyOfRange(b3, len1 + len2, len3),
|
||||
"Array equality test 3C failed.");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
/*
|
||||
* Copyright (c) 2024, 2025, 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 8330748
|
||||
* @summary Test ByteArrayOutputStream.writeTo releases carrier thread
|
||||
* @requires vm.continuations
|
||||
* @modules java.base/java.lang:+open
|
||||
* @library /test/lib
|
||||
* @run main WriteToReleasesCarrier
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.locks.LockSupport;
|
||||
import jdk.test.lib.thread.VThreadScheduler;
|
||||
|
||||
public class WriteToReleasesCarrier {
|
||||
public static void main(String[] args) throws Exception {
|
||||
byte[] bytes = "Hello".getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
var baos = new ByteArrayOutputStream();
|
||||
baos.write(bytes);
|
||||
|
||||
var target = new ParkingOutputStream();
|
||||
|
||||
try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
|
||||
Thread.Builder builder = VThreadScheduler.virtualThreadBuilder(scheduler);
|
||||
var started = new CountDownLatch(1);
|
||||
var vthread1 = builder.start(() -> {
|
||||
started.countDown();
|
||||
try {
|
||||
baos.writeTo(target);
|
||||
} catch (IOException ioe) { }
|
||||
});
|
||||
try {
|
||||
started.await();
|
||||
await(vthread1, Thread.State.WAITING);
|
||||
|
||||
// carrier should be released, use it for another thread
|
||||
var executed = new AtomicBoolean();
|
||||
var vthread2 = builder.start(() -> {
|
||||
executed.set(true);
|
||||
});
|
||||
vthread2.join();
|
||||
if (!executed.get()) {
|
||||
throw new RuntimeException("Second virtual thread did not run");
|
||||
}
|
||||
} finally {
|
||||
LockSupport.unpark(vthread1);
|
||||
vthread1.join();
|
||||
}
|
||||
}
|
||||
|
||||
if (!Arrays.equals(target.toByteArray(), bytes)) {
|
||||
throw new RuntimeException("Expected bytes not written");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Waits for a thread to get to the expected state.
|
||||
*/
|
||||
private static void await(Thread thread, Thread.State expectedState) throws Exception {
|
||||
Thread.State state = thread.getState();
|
||||
while (state != expectedState) {
|
||||
Thread.sleep(10);
|
||||
state = thread.getState();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An OutputStream that parks when writing.
|
||||
*/
|
||||
static class ParkingOutputStream extends OutputStream {
|
||||
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
|
||||
@Override
|
||||
public void write(int i) {
|
||||
LockSupport.park();
|
||||
baos.write(i);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte[] b, int off, int len) {
|
||||
LockSupport.park();
|
||||
baos.write(b, off, len);
|
||||
}
|
||||
|
||||
byte[] toByteArray() {
|
||||
return baos.toByteArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue