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

8027016: Array.prototype.indexOf should return -1 when array is of length zero

Browse Source 
Reviewed-by: lagergren, attila
This commit is contained in:
Athijegannathan Sundararajan 2013-10-22 14:27:52 +05:30
parent ef6f8003c8
commit fbb9a966b6
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
View File

@ -1163,12 +1163,16 @@ public final class NativeArray extends ScriptObject {
try {
final ScriptObject sobj = (ScriptObject)Global.toObject(self);
final long len = JSType.toUint32(sobj.getLength());
final long n = JSType.toLong(fromIndex);
if (len == 0 || n >= len) {
if (len == 0) {
return -1;
}
final long n = JSType.toLong(fromIndex);
if (n >= len) {
return -1;
}
for (long k = Math.max(0, (n < 0) ? (len - Math.abs(n)) : n); k < len; k++) {
if (sobj.has(k)) {
if (ScriptRuntime.EQ_STRICT(sobj.get(k), searchElement)) {

42
nashorn/test/script/basic/JDK-8027016.js Normal file
View File

@ -0,0 +1,42 @@
/*
* 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-8027016: Array.prototype.indexOf should return -1 when array is of length zero
*
* @test
* @run
*/
var res = [].indexOf(null, {valueOf:function(){throw "not reached"}});
if (res != -1) {
fail("expected -1 on indexOf on empty array");
}
// add index beyond length check as well
res = [].indexOf(null, 1);
if (res != -1) {
fail("expected -1 on indexOf on empty array");
}