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

8025312: parseInt should convert 'radix' argument to ToInt32 even if empty string is parsed

Browse Source 
Reviewed-by: jlaskey, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2013-09-24 20:43:42 +05:30
parent 1508b37a51
commit 93c8cbec9c
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
View File

@ -90,6 +90,7 @@ public final class GlobalFunctions {
public static double parseInt(final Object self, final Object string, final Object rad) {
final String str = JSType.trimLeft(JSType.toString(string));
final int length = str.length();
int radix = JSType.toInt32(rad);
// empty string is not valid
if (length == 0) {
@ -113,7 +114,6 @@ public final class GlobalFunctions {
}
boolean stripPrefix = true;
int radix = JSType.toInt32(rad);
if (radix != 0) {
if (radix < 2 || radix > 36) {

35
nashorn/test/script/basic/JDK-8025312.js Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2010, 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.
*/
/**
* JDK-8025312: parseInt should convert 'radix' argument to ToInt32 even if empty string is parsed
*
* @test
* @run
*/
parseInt("", {
valueOf: function() {
print("inside valueOf of 'radix'");
}
});

1
nashorn/test/script/basic/JDK-8025312.js.EXPECTED Normal file
View File

@ -0,0 +1 @@
inside valueOf of 'radix'