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
122
test/jdk/java/lang/Object/FinalizationOption.java
Normal file
122
test/jdk/java/lang/Object/FinalizationOption.java
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 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 8276422
|
||||
* @summary add command-line option to disable finalization
|
||||
* @run main/othervm FinalizationOption yes
|
||||
* @run main/othervm --finalization=enabled FinalizationOption yes
|
||||
* @run main/othervm --finalization=disabled FinalizationOption no
|
||||
*/
|
||||
public class FinalizationOption {
|
||||
static volatile boolean finalizerWasCalled = false;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
protected void finalize() {
|
||||
finalizerWasCalled = true;
|
||||
}
|
||||
|
||||
static void create() {
|
||||
new FinalizationOption();
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether the finalizer thread is or is not running. The finalizer thread
|
||||
* is a thread in the root thread group whose named is "Finalizer".
|
||||
* @param expected boolean indicating whether a finalizer thread should exist
|
||||
* @return boolean indicating whether the expectation was met
|
||||
*/
|
||||
static boolean checkFinalizerThread(boolean expected) {
|
||||
ThreadGroup root = Thread.currentThread().getThreadGroup();
|
||||
for (ThreadGroup parent = root;
|
||||
parent != null;
|
||||
root = parent, parent = root.getParent())
|
||||
;
|
||||
|
||||
int nt = 100;
|
||||
Thread[] threads;
|
||||
while (true) {
|
||||
threads = new Thread[nt];
|
||||
nt = root.enumerate(threads);
|
||||
if (nt < threads.length)
|
||||
break;
|
||||
threads = new Thread[nt + 100];
|
||||
}
|
||||
|
||||
Thread ft = null;
|
||||
for (int i = 0; i < nt; i++) {
|
||||
if ("Finalizer".equals(threads[i].getName())) {
|
||||
ft = threads[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
String msg = (ft == null) ? "(none)" : ft.toString();
|
||||
boolean passed = (ft != null) == expected;
|
||||
System.out.printf("Finalizer thread. Expected: %s Actual: %s %s%n",
|
||||
expected, msg, passed ? "Passed." : "FAILED!");
|
||||
return passed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether there was a call to the finalize() method.
|
||||
* @param expected boolean whether finalize() should be called
|
||||
* @return boolean indicating whether the expecation was met
|
||||
*/
|
||||
static boolean checkFinalizerCalled(boolean expected) {
|
||||
create();
|
||||
for (int i = 0; i < 100; i++) {
|
||||
System.gc();
|
||||
try {
|
||||
Thread.sleep(10L);
|
||||
} catch (InterruptedException ie) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
if (finalizerWasCalled) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
boolean passed = (expected == finalizerWasCalled);
|
||||
System.out.printf("Call to finalize(). Expected: %s Actual: %s %s%n",
|
||||
expected, finalizerWasCalled,
|
||||
passed ? "Passed." : "FAILED!");
|
||||
return passed;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
boolean finalizationEnabled = switch (args[0]) {
|
||||
case "yes" -> true;
|
||||
case "no" -> false;
|
||||
default -> {
|
||||
throw new AssertionError("usage: FinalizationOption yes|no");
|
||||
}
|
||||
};
|
||||
|
||||
boolean threadPass = checkFinalizerThread(finalizationEnabled);
|
||||
boolean calledPass = checkFinalizerCalled(finalizationEnabled);
|
||||
|
||||
if (!threadPass || !calledPass)
|
||||
throw new AssertionError("Test failed.");
|
||||
}
|
||||
}
|
||||
52
test/jdk/java/lang/Object/InvalidFinalizationOption.java
Normal file
52
test/jdk/java/lang/Object/InvalidFinalizationOption.java
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/*
|
||||
* Copyright (c) 2021, 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 8276422
|
||||
* @summary Invalid/missing values for the finalization option should be rejected
|
||||
* @library /test/lib
|
||||
* @run driver InvalidFinalizationOption
|
||||
*/
|
||||
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
|
||||
public class InvalidFinalizationOption {
|
||||
public static void main(String[] args) throws Exception {
|
||||
record TestData(String arg, String expected) { }
|
||||
|
||||
TestData[] testData = {
|
||||
new TestData("--finalization", "Unrecognized option"),
|
||||
new TestData("--finalization=", "Invalid finalization value"),
|
||||
new TestData("--finalization=azerty", "Invalid finalization value")
|
||||
};
|
||||
|
||||
for (var data : testData) {
|
||||
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(data.arg);
|
||||
OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
||||
output.shouldContain(data.expected);
|
||||
output.shouldHaveExitValue(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
46
test/jdk/java/lang/Object/WaitTooLong.java
Normal file
46
test/jdk/java/lang/Object/WaitTooLong.java
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* Copyright (c) 2018, 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 8210787
|
||||
* @summary Object.wait(long, int) throws inappropriate IllegalArgumentException
|
||||
*/
|
||||
|
||||
public class WaitTooLong {
|
||||
public static void main(String[] args) {
|
||||
test(0);
|
||||
test(1);
|
||||
test(500000);
|
||||
test(999999);
|
||||
}
|
||||
|
||||
static void test(int nanos) {
|
||||
try {
|
||||
WaitTooLong.class.wait(Long.MAX_VALUE, nanos);
|
||||
} catch (IllegalMonitorStateException expected) {
|
||||
} catch (IllegalArgumentException | InterruptedException unexpected) {
|
||||
throw new RuntimeException("Unexpected", unexpected);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue