Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 1231:5895d96a6a55
8075927: toNumber(String) accepts illegal characters
Reviewed-by: attila, sundar
author | hannesw |
---|---|
date | Wed, 25 Mar 2015 14:41:47 +0100 |
parents | b3c9cf883e3a |
children | 3bcfcb13c234 35030ba87ca8 |
files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java test/script/basic/JDK-8075927.js |
diffstat | 2 files changed, 46 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java Wed Mar 25 14:39:39 2015 +0300 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java Wed Mar 25 14:41:47 2015 +0100 @@ -933,11 +933,15 @@ 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));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8075927.js Wed Mar 25 14:41:47 2015 +0100 @@ -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); +