Mercurial > hg > release > icedtea8-forest-3.0 > nashorn
changeset 750:3f2b4f3e2c11
8031106: Nashorn: IndexOutOfBoundsException in NashornCallSiteDescriptor.getNameToken()
Reviewed-by: hannesw, jlaskey
author | sundar |
---|---|
date | Fri, 03 Jan 2014 10:09:48 +0530 |
parents | 23cbfa168a4e |
children | e8ca05a58112 |
files | src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java test/script/sandbox/JDK-8031106.js |
diffstat | 2 files changed, 41 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java Thu Dec 19 21:53:27 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java Fri Jan 03 10:09:48 2014 +0530 @@ -93,7 +93,8 @@ if ((self instanceof Class) && Modifier.isPublic(((Class<?>)self).getModifiers())) { final CallSiteDescriptor desc = requestWithoutContext.getCallSiteDescriptor(); if(CallSiteDescriptorFactory.tokenizeOperators(desc).contains("getProp")) { - if ("static".equals(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) { + if (desc.getNameTokenCount() > CallSiteDescriptor.NAME_OPERAND && + "static".equals(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) { if (Context.isAccessibleClass((Class<?>)self) && !isReflectionClass((Class<?>)self)) { // If "getProp:static" passes access checks, allow access.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/sandbox/JDK-8031106.js Fri Jan 03 10:09:48 2014 +0530 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2010, 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-8031106: Nashorn: IndexOutOfBoundsException in NashornCallSiteDescriptor.getNameToken() + * + * @test + * @run + */ + +var cl = new java.lang.Object().getClass(); +try { + cl["forName"]; + fail("Should have thrown exception!"); +} catch (e) { + if (! (e instanceof java.lang.SecurityException)) { + fail("SecurityException expected, got " + e); + } +}