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

8075927: toNumber(String) accepts illegal characters

Browse Source 
Reviewed-by: attila, sundar
This commit is contained in:
Hannes Wallnöfer 2015-03-25 14:41:47 +01:00
parent 540bb21731
commit 268d8ef7a6
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java
View File

@ -933,11 +933,15 @@ public enum JSType {
if (start + 1 < end && f == '0' && Character.toLowerCase(str.charAt(start + 1)) == 'x') {
//decode hex string
value = parseRadix(str.toCharArray(), start + 2, end, 16);
} else if (f == 'I' && end - start == 8 && str.regionMatches(start, "Infinity", 0, 8)) {
return negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY;
} else {
// Fast (no NumberFormatException) path to NaN for non-numeric strings. We allow those starting with "I" or
// "N" to allow for parsing "NaN" and "Infinity" correctly.
if ((f < '0' || f > '9') && f != '.' && f != 'I' && f != 'N') {
return Double.NaN;
// Fast (no NumberFormatException) path to NaN for non-numeric strings.
for (int i = start; i < end; i++) {
f = str.charAt(i);
if ((f < '0' || f > '9') && f != '.' && f != 'e' && f != 'E' && f != '+' && f != '-') {
return Double.NaN;
}
}
try {
value = Double.parseDouble(str.substring(start, end));

38
nashorn/test/script/basic/JDK-8075927.js Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (c) 2010, 2014, 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.
*/
/**
* JDK-8075927: toNumber(String) accepts illegal characters
*
* @test
* @run
*/
Assert.assertTrue(isNaN(Number("-123d")));
Assert.assertTrue(isNaN(Number("-123f")));
Assert.assertTrue(Number(" 123 ") === 123);
Assert.assertTrue(Number(" -123 ") === -123);
Assert.assertEquals(Number(" Infinity "), Infinity);
Assert.assertEquals(Number(" +Infinity "), Infinity);
Assert.assertEquals(Number(" -Infinity "), -Infinity);