Mercurial > hg > release > icedtea8-forest-3.0 > nashorn
changeset 758:33a61e7f43e6
8032004: instance property "message" of Error objects should be non-enumerable
Reviewed-by: hannesw, jlaskey
author | sundar |
---|---|
date | Thu, 16 Jan 2014 22:50:53 +0530 |
parents | 6d0808f127bd |
children | aef781b882c0 |
files | src/jdk/nashorn/internal/objects/NativeError.java src/jdk/nashorn/internal/objects/NativeEvalError.java src/jdk/nashorn/internal/objects/NativeRangeError.java src/jdk/nashorn/internal/objects/NativeReferenceError.java src/jdk/nashorn/internal/objects/NativeSyntaxError.java src/jdk/nashorn/internal/objects/NativeTypeError.java src/jdk/nashorn/internal/objects/NativeURIError.java test/script/basic/JDK-8032004.js test/script/basic/NASHORN-111.js.EXPECTED |
diffstat | 9 files changed, 51 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/objects/NativeError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeError.java Thu Jan 16 22:50:53 2014 +0530 @@ -74,7 +74,7 @@ static final String FILENAME = "__fileName__"; /** Message property name */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** ECMA 15.11.4.2 Error.prototype.name */
--- a/src/jdk/nashorn/internal/objects/NativeEvalError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeEvalError.java Thu Jan 16 22:50:53 2014 +0530 @@ -44,7 +44,7 @@ public final class NativeEvalError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- a/src/jdk/nashorn/internal/objects/NativeRangeError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeRangeError.java Thu Jan 16 22:50:53 2014 +0530 @@ -44,7 +44,7 @@ public final class NativeRangeError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- a/src/jdk/nashorn/internal/objects/NativeReferenceError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeReferenceError.java Thu Jan 16 22:50:53 2014 +0530 @@ -44,7 +44,7 @@ public final class NativeReferenceError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- a/src/jdk/nashorn/internal/objects/NativeSyntaxError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeSyntaxError.java Thu Jan 16 22:50:53 2014 +0530 @@ -44,7 +44,7 @@ public final class NativeSyntaxError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- a/src/jdk/nashorn/internal/objects/NativeTypeError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeTypeError.java Thu Jan 16 22:50:53 2014 +0530 @@ -44,7 +44,7 @@ public final class NativeTypeError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- a/src/jdk/nashorn/internal/objects/NativeURIError.java Thu Jan 16 21:26:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeURIError.java Thu Jan 16 22:50:53 2014 +0530 @@ -43,7 +43,7 @@ public final class NativeURIError extends ScriptObject { /** message property in instance */ - @Property(name = NativeError.MESSAGE) + @Property(name = NativeError.MESSAGE, attributes = Attribute.NOT_ENUMERABLE) public Object instMessage; /** error name property */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8032004.js Thu Jan 16 22:50:53 2014 +0530 @@ -0,0 +1,43 @@ +/* + * 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-8032004: instance property "message" of Error objects should be non-enumerable + * + * @test + * @run + */ + +function check(obj) { + if (obj.propertyIsEnumerable("message")) { + fail(obj.name + " object's message property is enumerable!"); + } +} + +check(new Error("test")); +check(new EvalError("test")); +check(new RangeError("test")); +check(new ReferenceError("test")); +check(new SyntaxError("test")); +check(new TypeError("test")); +check(new URIError("test"));