Runtime.java: Comment fix.
* java/lang/Runtime.java: Comment fix. * java/lang/ClassLoader.java (isAncestorOf): New method. (getParent): Uncommented security check. Use isAncestorOf. * include/jvm.h (_Jv_CheckAccess): Declare. * java/lang/reflect/natConstructor.cc (newInstance): Perform access check. Include IllegalAccessException.h, ArrayIndexOutOfBoundsException.h. * java/lang/reflect/natArray.cc (newInstance): Pass caller's class loader to _Jv_GetArrayClass. Include ArrayIndexOutOfBoundsException.h. * java/lang/reflect/Field.java: Update comment to reflect status. (equals): Fixed indentation. * java/lang/Class.h (Class): Declare memberAccessCheck, not checkMemberAccess. Make _Jv_CheckAccess a friend. * java/lang/Class.java (memberAccessCheck): New method from Classpath. (checkMemberAccess): Removed. (getDeclaredMethod): Use memberAccessCheck. (getField): Likewise. (getMethod): Likewise. * resolve.cc (_Jv_ResolvePoolEntry): Use _Jv_CheckAccess. (_Jv_SearchMethodInClass): Likewise. * prims.cc (_Jv_CheckAccess): New function. * jni.cc (_Jv_JNI_FindClass): Use getClassLoaderInternal. (_Jv_JNI_GetAnyFieldID): Likewise. * java/lang/natClass.cc (forName): Use getClassLoaderInternal. (getClassLoader): Added security check. (getConstructor): Call memberAccessCheck. (getDeclaredClasses): Likewise. (getDeclaredField): Likewise. (getDeclaredFields): Likewise. (_getConstructors): Likewise. (getDeclaredConstructor): Likewise. (getDeclaredMethods): Likewise. (getFields): Likewise. (getMethods): Likewise. (newInstance): Likewise. (_Jv_MakeVTable): Put method name in exception. * java/lang/reflect/natMethod.cc (getType): Use getClassLoaderInternal. (_Jv_GetTypesFromSignature): Likewise. (invoke): Perform access check. (_Jv_CallAnyMethodA): Removed old FIXME comments. Include ArrayIndexOutOfBoundsException.h. * java/lang/reflect/natField.cc (getType): Use getClassLoaderInternal. (_Jv_CheckFieldAccessibility): Removed. (getAddr): Use _Jv_CheckAccess; find caller. Include ArrayIndexOutOfBoundsException.h. From-SVN: r69621
This commit is contained in:
parent
3c87bc22a9
commit
ffd94572f4
15 changed files with 286 additions and 152 deletions
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
|
||||
/* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation
|
||||
|
||||
This file is part of libgcj.
|
||||
|
||||
|
@ -12,15 +12,6 @@ package java.lang.reflect;
|
|||
* @author Per Bothner <bothner@cygnus.com>
|
||||
* @date September 1998; February 1999.
|
||||
*/
|
||||
/* Status: Mostly implemented.
|
||||
* However, access checks are not implemented. See natField.cc for
|
||||
* _Jv_CheckFieldAccessibility as well as the missing getCaller.
|
||||
* Note that the idea is to have to compiler convert calls to
|
||||
* setXXX(...) and getXXX(...) to setXXX(CALLER, ...) and getXXX(CALLER, ...),
|
||||
* where CALLER is reference to the class that contains the calls to
|
||||
* setXXX or getXXX. This is easy for the compiler, and replaces
|
||||
* expensive stack and table searching with a constant.
|
||||
*/
|
||||
|
||||
public final class Field extends AccessibleObject implements Member
|
||||
{
|
||||
|
@ -39,12 +30,12 @@ public final class Field extends AccessibleObject implements Member
|
|||
}
|
||||
|
||||
public boolean equals (Object fld)
|
||||
{
|
||||
if (! (fld instanceof Field))
|
||||
return false;
|
||||
Field f = (Field) fld;
|
||||
return declaringClass == f.declaringClass && offset == f.offset;
|
||||
}
|
||||
{
|
||||
if (! (fld instanceof Field))
|
||||
return false;
|
||||
Field f = (Field) fld;
|
||||
return declaringClass == f.declaringClass && offset == f.offset;
|
||||
}
|
||||
|
||||
public Class getDeclaringClass ()
|
||||
{
|
||||
|
@ -62,11 +53,6 @@ public final class Field extends AccessibleObject implements Member
|
|||
return (declaringClass.hashCode() ^ offset);
|
||||
}
|
||||
|
||||
// The idea is that the compiler will magically translate
|
||||
// fld.getShort(obj) to fld.getShort(THISCLASS, obj).
|
||||
// This makes checking assessiblity more efficient,
|
||||
// since we don't have to do any stack-walking.
|
||||
|
||||
public boolean getBoolean (Object obj)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue