Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java	Thu Dec 19 21:53:27 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java	Fri Jan 03 10:09:48 2014 +0530
     1.3 @@ -93,7 +93,8 @@
     1.4              if ((self instanceof Class) && Modifier.isPublic(((Class<?>)self).getModifiers())) {
     1.5                  final CallSiteDescriptor desc = requestWithoutContext.getCallSiteDescriptor();
     1.6                  if(CallSiteDescriptorFactory.tokenizeOperators(desc).contains("getProp")) {
     1.7 -                    if ("static".equals(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) {
     1.8 +                    if (desc.getNameTokenCount() > CallSiteDescriptor.NAME_OPERAND &&
     1.9 +                        "static".equals(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) {
    1.10                          if (Context.isAccessibleClass((Class<?>)self) && !isReflectionClass((Class<?>)self)) {
    1.11  
    1.12                              // If "getProp:static" passes access checks, allow access.

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/sandbox/JDK-8031106.js	Fri Jan 03 10:09:48 2014 +0530
     2.3 @@ -0,0 +1,39 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8031106: Nashorn: IndexOutOfBoundsException in NashornCallSiteDescriptor.getNameToken()
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var cl = new java.lang.Object().getClass();
    2.35 +try {
    2.36 +   cl["forName"];
    2.37 +   fail("Should have thrown exception!");
    2.38 +} catch (e) {
    2.39 +   if (! (e instanceof java.lang.SecurityException)) {
    2.40 +       fail("SecurityException expected, got " + e);
    2.41 +   }
    2.42 +}