ffd94572f4
* 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
80 lines
2.1 KiB
C++
80 lines
2.1 KiB
C++
// natConstructor.cc - Native code for Constructor class.
|
|
|
|
/* Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#include <config.h>
|
|
|
|
#include <gcj/cni.h>
|
|
#include <jvm.h>
|
|
|
|
#include <java/lang/ArrayIndexOutOfBoundsException.h>
|
|
#include <java/lang/IllegalAccessException.h>
|
|
#include <java/lang/reflect/Constructor.h>
|
|
#include <java/lang/reflect/Method.h>
|
|
#include <java/lang/reflect/InvocationTargetException.h>
|
|
#include <java/lang/reflect/Modifier.h>
|
|
#include <java/lang/InstantiationException.h>
|
|
#include <gcj/method.h>
|
|
|
|
jint
|
|
java::lang::reflect::Constructor::getModifiers ()
|
|
{
|
|
// Ignore all unknown flags.
|
|
return _Jv_FromReflectedConstructor (this)->accflags & Modifier::ALL_FLAGS;
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Constructor::getType ()
|
|
{
|
|
_Jv_GetTypesFromSignature (_Jv_FromReflectedConstructor (this),
|
|
declaringClass,
|
|
¶meter_types,
|
|
NULL);
|
|
|
|
// FIXME: for now we have no way to get exception information.
|
|
exception_types =
|
|
(JArray<jclass> *) JvNewObjectArray (0, &java::lang::Class::class$, NULL);
|
|
}
|
|
|
|
jobject
|
|
java::lang::reflect::Constructor::newInstance (jobjectArray args)
|
|
{
|
|
if (parameter_types == NULL)
|
|
getType ();
|
|
|
|
gnu::gcj::runtime::StackTrace *t
|
|
= new gnu::gcj::runtime::StackTrace(4);
|
|
Class *caller = NULL;
|
|
try
|
|
{
|
|
for (int i = 1; !caller; i++)
|
|
{
|
|
caller = t->classAt (i);
|
|
}
|
|
}
|
|
catch (::java::lang::ArrayIndexOutOfBoundsException *e)
|
|
{
|
|
}
|
|
|
|
if (! isAccessible() && ! _Jv_CheckAccess(caller, declaringClass,
|
|
declaringClass->getModifiers()))
|
|
throw new java::lang::IllegalAccessException;
|
|
|
|
using namespace java::lang::reflect;
|
|
if (Modifier::isAbstract (declaringClass->getModifiers()))
|
|
throw new InstantiationException;
|
|
|
|
_Jv_InitClass (declaringClass);
|
|
|
|
jmethodID meth = _Jv_FromReflectedConstructor (this);
|
|
// In the constructor case the return type is the type of the
|
|
// constructor.
|
|
return _Jv_CallAnyMethodA (NULL, declaringClass, meth, true,
|
|
parameter_types, args);
|
|
}
|