OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natVMSecurityManager.cc (getClassContext): Add new arg: klass. 

2005-03-17  Andrew Haley  <aph@redhat.com>

	* java/lang/natVMSecurityManager.cc (getClassContext): Add new
	arg: klass.
	Pass klass to _Jv_StackTrace::GetClassContext().
	* java/lang/ClassLoader.java (getParent): Pass class to
	VMSecurityManager.getClassContext()
	(getSystemClassLoader): Likewise.
	* java/lang/Package.java (getPackage): Likewise.
	(getPackages): Likewise.
	* java/lang/SecurityManager.java (getClassContext): Likewise.
	(currentClassLoader): Likewise.
	* java/lang/VMSecurityManager.java: (getClassContext): Likewise.
	(currentClassLoader) Add new arg: caller.
	Pass caller to VMSecurityManager.getClassContext.

	* stacktrace.cc (GetClassContext): Correct calculation of
	jframe_count.

	* boehm.cc (_Jv_MarkObj): (_Jv_MarkObj): Mark
	im->source_file_name.

From-SVN: r96803
This commit is contained in:
Andrew Haley 2005-03-21 14:50:14 +00:00 committed by Andrew Haley
parent 21e01bf10d
commit e5a8980bb9
8 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libjava/ChangeLog
View File

@ -1,3 +1,25 @@
2005-03-17 Andrew Haley <aph@redhat.com>
* java/lang/natVMSecurityManager.cc (getClassContext): Add new
arg: klass.
Pass klass to _Jv_StackTrace::GetClassContext().
* java/lang/ClassLoader.java (getParent): Pass class to
VMSecurityManager.getClassContext()
(getSystemClassLoader): Likewise.
* java/lang/Package.java (getPackage): Likewise.
(getPackages): Likewise.
* java/lang/SecurityManager.java (getClassContext): Likewise.
(currentClassLoader): Likewise.
* java/lang/VMSecurityManager.java: (getClassContext): Likewise.
(currentClassLoader) Add new arg: caller.
Pass caller to VMSecurityManager.getClassContext.
* stacktrace.cc (GetClassContext): Correct calculation of
jframe_count.
* boehm.cc (_Jv_MarkObj): (_Jv_MarkObj): Mark
im->source_file_name.
2005-03-16 Andrew Haley <aph@redhat.com>
* boehm.cc (_Jv_MarkObj): Mark the interpreted method line_table.

3
libjava/boehm.cc
View File

@ -248,6 +248,9 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void *env)
p = (GC_PTR) ic->interpreted_methods;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic);
p = (GC_PTR) ic->source_file_name;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic);
for (int i = 0; i < c->method_count; i++)
{
// The interpreter installs a heap-allocated trampoline

4
libjava/java/lang/ClassLoader.java
View File

@ -486,7 +486,7 @@ public abstract class ClassLoader
SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
Class c = VMSecurityManager.getClassContext()[1];
Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1];
ClassLoader cl = c.getClassLoader();
if (cl != null && ! cl.isAncestorOf(this))
sm.checkPermission(new RuntimePermission("getClassLoader"));
@ -729,7 +729,7 @@ public abstract class ClassLoader
SecurityManager sm = System.getSecurityManager();
if (sm != null)
{
Class c = VMSecurityManager.getClassContext()[1];
Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1];
ClassLoader cl = c.getClassLoader();
if (cl != null && cl != systemClassLoader)
sm.checkPermission(new RuntimePermission("getClassLoader"));

4
libjava/java/lang/Package.java
View File

@ -273,7 +273,7 @@ public class Package
public static Package getPackage(String name)
{
// Get the caller's classloader
ClassLoader cl = VMSecurityManager.currentClassLoader();
ClassLoader cl = VMSecurityManager.currentClassLoader(Package.class);
return cl != null ? cl.getPackage(name) : VMClassLoader.getPackage(name);
}
@ -286,7 +286,7 @@ public class Package
public static Package[] getPackages()
{
// Get the caller's classloader
Class c = VMSecurityManager.getClassContext()[1];
Class c = VMSecurityManager.getClassContext(Package.class)[1];
ClassLoader cl = c.getClassLoader();
return cl != null ? cl.getPackages() : VMClassLoader.getPackages();
}

4
libjava/java/lang/SecurityManager.java
View File

@ -167,7 +167,7 @@ public class SecurityManager
*/
protected Class[] getClassContext()
{
return VMSecurityManager.getClassContext();
return VMSecurityManager.getClassContext(SecurityManager.class);
}
/**
@ -189,7 +189,7 @@ public class SecurityManager
*/
protected ClassLoader currentClassLoader()
{
return VMSecurityManager.currentClassLoader();
return VMSecurityManager.currentClassLoader(SecurityManager.class);
}
/**

6
libjava/java/lang/VMSecurityManager.java
View File

@ -43,19 +43,19 @@ class VMSecurityManager
** @return an array containing all the methods on classes
** on the Java execution stack.
**/
static native Class[] getClassContext();
static native Class[] getClassContext(Class caller);
/** Get the current ClassLoader--the one nearest to the
** top of the stack.
** @return the current ClassLoader.
**/
static ClassLoader currentClassLoader()
static ClassLoader currentClassLoader(Class caller)
{
// The docs above are wrong. See the online docs.
// FIXME this implementation is a bit wrong too -- the docs say we
// must also consider ancestors of the system class loader.
ClassLoader systemClassLoader = VMClassLoader.getSystemClassLoader();
Class[] classStack = getClassContext ();
Class[] classStack = getClassContext (caller);
for (int i = 0; i < classStack.length; i++)
{
ClassLoader loader = classStack[i].getClassLoader();

4
libjava/java/lang/natVMSecurityManager.cc
View File

@ -20,10 +20,10 @@ details. */
#include <java/lang/Class.h>
JArray<jclass> *
java::lang::VMSecurityManager::getClassContext ()
java::lang::VMSecurityManager::getClassContext (jclass klass)
{
JArray<jclass> *result =
_Jv_StackTrace::GetClassContext (&SecurityManager::class$);
_Jv_StackTrace::GetClassContext (klass);
return result;
}

20
libjava/stacktrace.cc
View File

@ -464,19 +464,17 @@ _Jv_StackTrace::GetClassContext (jclass checkClass)
_Jv_StackFrame *frame = &state.frames[i];
FillInFrameInfo (frame);
if (seen_checkClass
&& frame->klass
&& frame->klass != checkClass)
if (seen_checkClass)
{
jframe_count++;
if (start_pos == -1)
start_pos = i;
if (frame->klass)
{
jframe_count++;
if (start_pos == -1)
start_pos = i;
}
}
if (!seen_checkClass
&& frame->klass
&& frame->klass == checkClass)
seen_checkClass = true;
else
seen_checkClass = frame->klass == checkClass;
}
result = (JArray<jclass> *) _Jv_NewObjectArray (jframe_count, &Class::class$, NULL);
int pos = 0;