stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8277100: Dynamic dump can inadvertently overwrite default CDS archive

Browse Source 
Reviewed-by: iklam, minqi, dholmes
This commit is contained in:
Calvin Cheung 2021-12-20 23:04:40 +00:00
parent 4c78c9ab80
commit 8549d8b569
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/share/runtime/arguments.cpp
View File

@ -3514,6 +3514,11 @@ void Arguments::init_shared_archive_paths() {
vm_exit_during_initialization("-XX:ArchiveClassesAtExit cannot be used with -Xshare:dump");
}
check_unsupported_dumping_properties();
if (os::same_files((const char*)get_default_shared_archive_path(), ArchiveClassesAtExit)) {
vm_exit_during_initialization(
"Cannot specify the default CDS archive for -XX:ArchiveClassesAtExit", get_default_shared_archive_path());
}
}
if (SharedArchiveFile == nullptr) {

58
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DumpToDefaultArchive.java Normal file
View File

@ -0,0 +1,58 @@
/*
* 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 8277100
* @summary VM should exit with an error message if the specified dynamic archive
* is the same as the default CDS archive.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @build sun.hotspot.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. DumpToDefaultArchive
*/
import jdk.test.lib.helpers.ClassFileInstaller;
import sun.hotspot.WhiteBox;
public class DumpToDefaultArchive extends DynamicArchiveTestBase {
public static void main(String[] args) throws Exception {
runTest(DumpToDefaultArchive::doTest);
}
private static void doTest() throws Exception {
WhiteBox wb = WhiteBox.getWhiteBox();
String topArchiveName = wb.getDefaultArchivePath();
dump(topArchiveName,
"-Xlog:cds",
"-version")
.assertAbnormalExit(output -> {
output.shouldContain("Cannot specify the default CDS archive for -XX:ArchiveClassesAtExit: "
+ topArchiveName);
});
}
}