infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 14:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8025661: Ill-formed -Xminf and -Xmaxf options values interpreted as 0

Browse Source 
Using strtod() instead of atof() when parsing -Xminf and -Xmaxf.

Reviewed-by: brutisso, pliden
This commit is contained in:
Stefan Johansson 2013-10-14 14:21:34 +02:00
parent 588c91b042
commit 3e9df3ecf1
2 changed files with 111 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2694,8 +2694,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
FLAG_SET_CMDLINE(uintx, MaxHeapSize, (uintx)long_max_heap_size);
// Xmaxf
} else if (match_option(option, "-Xmaxf", &tail)) {
int maxf = (int)(atof(tail) * 100);
if (maxf < 0 || maxf > 100) {
char* err;
int maxf = (int)(strtod(tail, &err) * 100);
if (*err != '\0' || maxf < 0 || maxf > 100) {
jio_fprintf(defaultStream::error_stream(),
"Bad max heap free percentage size: %s\n",
option->optionString);
@ -2705,8 +2706,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
}
// Xminf
} else if (match_option(option, "-Xminf", &tail)) {
int minf = (int)(atof(tail) * 100);
if (minf < 0 || minf > 100) {
char* err;
int minf = (int)(strtod(tail, &err) * 100);
if (*err != '\0' || minf < 0 || minf > 100) {
jio_fprintf(defaultStream::error_stream(),
"Bad min heap free percentage size: %s\n",
option->optionString);

105
hotspot/test/gc/arguments/TestHeapFreeRatio.java Normal file
View File

@ -0,0 +1,105 @@
/*
* Copyright (c) 2013, 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 TestHeapFreeRatio
* @key gc
* @bug 8025661
* @summary Test parsing of -Xminf and -Xmaxf
* @library /testlibrary
* @run main/othervm TestHeapFreeRatio
*/
import com.oracle.java.testlibrary.*;
public class TestHeapFreeRatio {
enum Validation {
VALID,
MIN_INVALID,
MAX_INVALID,
COMBINATION_INVALID
}
private static void testMinMaxFreeRatio(String min, String max, Validation type) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xminf" + min,
"-Xmaxf" + max,
"-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
switch (type) {
case VALID:
output.shouldNotContain("Error");
output.shouldHaveExitValue(0);
break;
case MIN_INVALID:
output.shouldContain("Bad min heap free percentage size: -Xminf" + min);
output.shouldContain("Error");
output.shouldHaveExitValue(1);
break;
case MAX_INVALID:
output.shouldContain("Bad max heap free percentage size: -Xmaxf" + max);
output.shouldContain("Error");
output.shouldHaveExitValue(1);
break;
case COMBINATION_INVALID:
output.shouldContain("must be less than or equal to MaxHeapFreeRatio");
output.shouldContain("Error");
output.shouldHaveExitValue(1);
break;
default:
throw new IllegalStateException("Must specify expected validation type");
}
System.out.println(output.getOutput());
}
public static void main(String args[]) throws Exception {
testMinMaxFreeRatio( "0.1", "0.5", Validation.VALID);
testMinMaxFreeRatio( ".1", ".5", Validation.VALID);
testMinMaxFreeRatio( "0.5", "0.5", Validation.VALID);
testMinMaxFreeRatio("-0.1", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio( "1.1", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio("=0.1", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio("0.1f", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio(
"INVALID", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio(
"2147483647", "0.5", Validation.MIN_INVALID);
testMinMaxFreeRatio( "0.1", "-0.5", Validation.MAX_INVALID);
testMinMaxFreeRatio( "0.1", "1.5", Validation.MAX_INVALID);
testMinMaxFreeRatio( "0.1", "0.5f", Validation.MAX_INVALID);
testMinMaxFreeRatio( "0.1", "=0.5", Validation.MAX_INVALID);
testMinMaxFreeRatio(
"0.1", "INVALID", Validation.MAX_INVALID);
testMinMaxFreeRatio(
"0.1", "2147483647", Validation.MAX_INVALID);
testMinMaxFreeRatio( "0.5", "0.1", Validation.COMBINATION_INVALID);
testMinMaxFreeRatio( ".5", ".10", Validation.COMBINATION_INVALID);
testMinMaxFreeRatio("0.12","0.100", Validation.COMBINATION_INVALID);
}
}