2007-04-16 Andrew Haley <aph@redhat.com>

        * gnu/gcj/runtime/BootClassLoader.java (getBootURLLoader): New
        method.
        (bootGetResource): Use getBootURLLoader() to load resources.
        (bootGetResources): Likewise.

        * java/lang/reflect/natMethod.cc (Method::invoke): In invoke also
        check that the method's declaring class is accessible.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123862 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 5 deletions

diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index 6dcd4ec518a..4593da7f49e 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -173,16 +173,34 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
     }
 
   // Check accessibility, if required.
-  if (! (Modifier::isPublic (meth->accflags) || this->isAccessible()))
+  if (! this->isAccessible())
     {
-      Class *caller = _Jv_StackTrace::GetCallingClass (&Method::class$);
-      if (! _Jv_CheckAccess(caller, declaringClass, meth->accflags))
-	throw new IllegalAccessException;
+      if (! (Modifier::isPublic (meth->accflags)))
+	{
+	  Class *caller = _Jv_StackTrace::GetCallingClass (&Method::class$);
+	  if (! _Jv_CheckAccess(caller, declaringClass, meth->accflags))
+	    throw new IllegalAccessException;
+	}
+      else
+	// Method is public, check to see if class is accessible.
+	{
+	  jint flags = (declaringClass->accflags
+			& (Modifier::PUBLIC
+			   | Modifier::PROTECTED
+			   | Modifier::PRIVATE));
+	  if (flags == 0) // i.e. class is package private
+	    {
+	      Class *caller = _Jv_StackTrace::GetCallingClass (&Method::class$);
+	      if (! _Jv_ClassNameSamePackage (caller->name,
+					      declaringClass->name))
+		throw new IllegalAccessException;
+	    }
+	}
     }
 
   if (declaringClass->isInterface())
     iface = declaringClass;
-  
+
   return _Jv_CallAnyMethodA (obj, return_type, meth, false,
 			     parameter_types, args, iface);
 }