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

Merge

Browse Source
This commit is contained in:
David Holmes 2015-07-02 12:05:19 +02:00
commit 184e6f6d8b
2 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -837,16 +837,19 @@ bool Arguments::process_argument(const char* arg,
arg_len = equal_sign - argname; arg_len = equal_sign - argname;
} }
// Construct a string which consists only of the argument name without '+', '-', or '='. // Only make the obsolete check for valid arguments.
char stripped_argname[256]; if (arg_len <= BUFLEN) {
strncpy(stripped_argname, argname, arg_len); // Construct a string which consists only of the argument name without '+', '-', or '='.
stripped_argname[arg_len] = '\0'; //strncpy doesn't null terminate. char stripped_argname[BUFLEN+1];
strncpy(stripped_argname, argname, arg_len);
stripped_argname[arg_len] = '\0'; // strncpy may not null terminate.
if (is_newly_obsolete(stripped_argname, &since)) { if (is_newly_obsolete(stripped_argname, &since)) {
char version[256]; char version[256];
since.to_string(version, sizeof(version)); since.to_string(version, sizeof(version));
warning("ignoring option %s; support was removed in %s", stripped_argname, version); warning("ignoring option %s; support was removed in %s", stripped_argname, version);
return true; return true;
}
} }
// For locked flags, report a custom error message if available. // For locked flags, report a custom error message if available.

48
hotspot/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2015, 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 8129786
* @summary Verify that JVM correctly processes very long unrecognized VM option
* @library /testlibrary
* @modules java.management
* @run main TestLongUnrecognizedVMOption
*/
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.ProcessTools;
public class TestLongUnrecognizedVMOption {
/* Create option with very long length(greater than 500 characters) */
private static final String VERY_LONG_OPTION = String.format("%500s=10", "unrecognizedoption").replace(" ", "a");
public static void main(String[] args) throws Exception {
OutputAnalyzer output;
output = new OutputAnalyzer(ProcessTools.createJavaProcessBuilder("-XX:" + VERY_LONG_OPTION, "-version").start());
output.shouldHaveExitValue(1);
output.shouldContain(String.format("Unrecognized VM option '%s'", VERY_LONG_OPTION));
}
}