8200716: Object propertyIsEnumerable buggy behavior on short integer-string key
Reviewed-by: jlaskey, sundar
This commit is contained in:
parent
78bd242097
commit
4bbca4651c
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects
test/nashorn/script/basic
@ -66,6 +66,7 @@ import jdk.nashorn.internal.runtime.PropertyMap;
|
||||
import jdk.nashorn.internal.runtime.ScriptObject;
|
||||
import jdk.nashorn.internal.runtime.ScriptRuntime;
|
||||
import jdk.nashorn.internal.runtime.arrays.ArrayData;
|
||||
import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
|
||||
import jdk.nashorn.internal.runtime.linker.Bootstrap;
|
||||
import jdk.nashorn.internal.runtime.linker.InvokeByName;
|
||||
import jdk.nashorn.internal.runtime.linker.NashornBeansLinker;
|
||||
@ -613,8 +614,13 @@ public final class NativeObject {
|
||||
final Object obj = Global.toObject(self);
|
||||
|
||||
if (obj instanceof ScriptObject) {
|
||||
final jdk.nashorn.internal.runtime.Property property = ((ScriptObject)obj).getMap().findProperty(str);
|
||||
return property != null && property.isEnumerable();
|
||||
final ScriptObject sobj = (ScriptObject) obj;
|
||||
final Property property = sobj.getProperty(str);
|
||||
if (property != null) {
|
||||
return property.isEnumerable();
|
||||
} else {
|
||||
return (sobj.getArray().has(ArrayIndex.getArrayIndex(v)));
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
39
test/nashorn/script/basic/JDK-8200716.js
Normal file
39
test/nashorn/script/basic/JDK-8200716.js
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 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-8200716: Object propertyIsEnumerable buggy behavior on short integer-string key
|
||||
*
|
||||
* @test
|
||||
* @run
|
||||
*/
|
||||
|
||||
|
||||
var o = ({ '1': 1 });
|
||||
Assert.assertTrue(o.propertyIsEnumerable('1'));
|
||||
|
||||
Object.defineProperty(o, '1', { enumerable: false, value: 1 });
|
||||
Assert.assertFalse(o.propertyIsEnumerable('1'));
|
||||
|
||||
Object.defineProperty(o, '1', { enumerable: true, value: 1 });
|
||||
Assert.assertTrue(o.propertyIsEnumerable('1'));
|
Loading…
x
Reference in New Issue
Block a user