From c858eb6440a379dfc500bbb8b22fc0957316ee36 Mon Sep 17 00:00:00 2001 From: sundar Date: Tue, 25 Feb 2014 18:56:10 +0530 Subject: [PATCH] 8030197: Nashorn: Object.defineProperty() can be lured to change fixed NaN property Reviewed-by: attila, jlaskey --- .../objects/AccessorPropertyDescriptor.java | 12 +++++ .../objects/DataPropertyDescriptor.java | 13 ++++++ .../objects/GenericPropertyDescriptor.java | 17 +++++++ .../internal/runtime/PropertyDescriptor.java | 7 +++ .../internal/runtime/ScriptObject.java | 2 +- test/script/basic/JDK-8030197.js | 46 +++++++++++++++++++ 6 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 test/script/basic/JDK-8030197.js diff --git a/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java index b3731620..4d3fd43d 100644 --- a/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java +++ b/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java @@ -184,6 +184,18 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr return ACCESSOR; } + @Override + public boolean hasAndEquals(final PropertyDescriptor otherDesc) { + if (! (otherDesc instanceof AccessorPropertyDescriptor)) { + return false; + } + final AccessorPropertyDescriptor other = (AccessorPropertyDescriptor)otherDesc; + return (!has(CONFIGURABLE) || sameValue(configurable, other.configurable)) && + (!has(ENUMERABLE) || sameValue(enumerable, other.enumerable)) && + (!has(GET) || sameValue(get, other.get)) && + (!has(SET) || sameValue(set, other.set)); + } + @Override public boolean equals(final Object obj) { if (this == obj) { diff --git a/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java index ef3f0a30..39325627 100644 --- a/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java +++ b/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java @@ -171,6 +171,19 @@ public final class DataPropertyDescriptor extends ScriptObject implements Proper return DATA; } + @Override + public boolean hasAndEquals(final PropertyDescriptor otherDesc) { + if (! (otherDesc instanceof DataPropertyDescriptor)) { + return false; + } + + final DataPropertyDescriptor other = (DataPropertyDescriptor)otherDesc; + return (!has(CONFIGURABLE) || sameValue(configurable, other.configurable)) && + (!has(ENUMERABLE) || sameValue(enumerable, other.enumerable)) && + (!has(WRITABLE) || sameValue(writable, other.writable)) && + (!has(VALUE) || sameValue(value, other.value)); + } + @Override public boolean equals(final Object obj) { if (this == obj) { diff --git a/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java index f5662efa..221fe002 100644 --- a/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java +++ b/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java @@ -148,6 +148,23 @@ public final class GenericPropertyDescriptor extends ScriptObject implements Pro return GENERIC; } + @Override + public boolean hasAndEquals(final PropertyDescriptor other) { + if (has(CONFIGURABLE) && other.has(CONFIGURABLE)) { + if (isConfigurable() != other.isConfigurable()) { + return false; + } + } + + if (has(ENUMERABLE) && other.has(ENUMERABLE)) { + if (isEnumerable() != other.isEnumerable()) { + return false; + } + } + + return true; + } + @Override public boolean equals(final Object obj) { if (this == obj) { diff --git a/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java index 49a7a9d6..f36bd45e 100644 --- a/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java +++ b/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java @@ -151,5 +151,12 @@ public interface PropertyDescriptor { * @return true if property exists in implementor */ public boolean has(Object key); + + /** + * Check existence and compare attributes of descriptors. + * + * @return true if every field of this desc exists in otherDesc and has the same value. + */ + public boolean hasAndEquals(PropertyDescriptor otherDesc); } diff --git a/src/jdk/nashorn/internal/runtime/ScriptObject.java b/src/jdk/nashorn/internal/runtime/ScriptObject.java index 4b85ed4e..4b3bb939 100644 --- a/src/jdk/nashorn/internal/runtime/ScriptObject.java +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java @@ -469,7 +469,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr return true; } - if (currentDesc.equals(newDesc)) { + if (newDesc.hasAndEquals(currentDesc)) { // every descriptor field of the new is same as the current return true; } diff --git a/test/script/basic/JDK-8030197.js b/test/script/basic/JDK-8030197.js new file mode 100644 index 00000000..366d33df --- /dev/null +++ b/test/script/basic/JDK-8030197.js @@ -0,0 +1,46 @@ +/* + * Copyright (c) 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-8030197: Nashorn: Object.defineProperty() can be lured to change fixed NaN property + * + * @test + * @run + */ + +function str(n) { + var a = new Uint8Array(new Float64Array([n]).buffer); + return Array.apply(null, a).reduceRight( + function(acc, v){ + return acc + (v < 10 ? "0" : "") + v.toString(16); + }, ""); +} + +var o = Object.defineProperty({}, "NaN", { value: NaN }) +var str1 = str(o.NaN); +Object.defineProperty(o, "NaN", { value: 0/0 }) +var str2 = str(o.NaN); +if (str1 != str2) { + fail("NaN bit pattern changed"); +} -- GitLab