diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/reflect/natField.cc | 41 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/natMethod.cc | 44 |
2 files changed, 49 insertions, 36 deletions
diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc index b7f12f06e92..469cf74de8e 100644 --- a/libjava/java/lang/reflect/natField.cc +++ b/libjava/java/lang/reflect/natField.cc @@ -58,27 +58,32 @@ getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj) // have the compiler insert the caller as a hidden argument in some // calls. However, we never implemented that, so we have to find // the caller by hand instead. - gnu::gcj::runtime::StackTrace *t - = new gnu::gcj::runtime::StackTrace(7); - try - { - // We want to skip all the frames on the stack from this class. - for (int i = 1; - !caller || caller == &java::lang::reflect::Field::class$; - i++) - caller = t->classAt (i); - } - catch (::java::lang::ArrayIndexOutOfBoundsException *e) - { - } - + + using namespace java::lang::reflect; + jfieldID fld = _Jv_FromReflectedField (field); _Jv_ushort flags = fld->getModifiers(); - if (! field->isAccessible () - && ! _Jv_CheckAccess (caller, field->getDeclaringClass(), flags)) - throw new java::lang::IllegalAccessException; + + // Check accessibility, if required. + if (! (Modifier::isPublic (flags) || field->isAccessible())) + { + gnu::gcj::runtime::StackTrace *t + = new gnu::gcj::runtime::StackTrace(7); + try + { + // We want to skip all the frames on the stack from this class. + for (int i = 1; !caller || caller == &Field::class$; i++) + caller = t->classAt (i); + } + catch (::java::lang::ArrayIndexOutOfBoundsException *e) + { + } + + if (! _Jv_CheckAccess (caller, field->getDeclaringClass(), flags)) + throw new java::lang::IllegalAccessException; + } - if (flags & java::lang::reflect::Modifier::STATIC) + if (flags & Modifier::STATIC) { jclass fldClass = field->getDeclaringClass (); JvInitClass(fldClass); diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc index 6330c4b4675..b3413ce6880 100644 --- a/libjava/java/lang/reflect/natMethod.cc +++ b/libjava/java/lang/reflect/natMethod.cc @@ -28,6 +28,7 @@ details. */ #include <java/lang/Long.h> #include <java/lang/Float.h> #include <java/lang/Double.h> +#include <java/lang/IllegalAccessException.h> #include <java/lang/IllegalArgumentException.h> #include <java/lang/NullPointerException.h> #include <java/lang/ArrayIndexOutOfBoundsException.h> @@ -141,26 +142,15 @@ get_ffi_type (jclass klass) jobject java::lang::reflect::Method::invoke (jobject obj, jobjectArray args) { + using namespace java::lang::reflect; + 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) - { - } - + jmethodID meth = _Jv_FromReflectedMethod (this); + jclass klass; - if (! java::lang::reflect::Modifier::isStatic(meth->accflags)) + if (! Modifier::isStatic(meth->accflags)) { if (! obj) throw new java::lang::NullPointerException; @@ -181,8 +171,26 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args) klass = declaringClass; } - if (! isAccessible() && ! _Jv_CheckAccess(caller, klass, meth->accflags)) - throw new IllegalArgumentException; + // Check accessibility, if required. + if (! (Modifier::isPublic (meth->accflags) || this->isAccessible())) + { + 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 (! _Jv_CheckAccess(caller, klass, meth->accflags)) + throw new IllegalAccessException; + } return _Jv_CallAnyMethodA (obj, return_type, meth, false, parameter_types, args); |