Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing http://bugzilla.mozilla.org/show_bug.cgi?id=214608 :

Browse Source 
The reason for the regression is that now JavaMembers.lookupClass never
attempts to reflect package-private classes. But this is wrong since even with
SecirutyManager installed JVM allows to call Class.getMethos()( and returns
list of all public methods in the class and its super classes.

The patch removes the restrictions while making JavaMembers.lookupClass much
simpler.
This commit is contained in:
igor%mir2.org 2003-07-31 17:08:58 +00:00
parent f43d2fc1f1
commit 9d44b5410e
1 changed files with 16 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/rhino/src/org/mozilla/javascript/JavaMembers.java
View File

@ -590,40 +590,15 @@ class JavaMembers
static JavaMembers lookupClass(Scriptable scope, Class dynamicType,
Class staticType)
{
JavaMembers members;
Hashtable ct = classTable; // use local reference to avoid synchronize
JavaMembers members = (JavaMembers) ct.get(dynamicType);
if (members != null)
return members;
if (staticType == dynamicType) {
staticType = null;
}
Class cl = dynamicType;
if (!Modifier.isPublic(dynamicType.getModifiers())) {
if (staticType == null
|| !Modifier.isPublic(staticType.getModifiers()))
{
cl = getPublicSuperclass(dynamicType);
if (cl == null) {
// Can happen if dynamicType is interface
cl = dynamicType;
}
} else if (staticType.isInterface()) {
// If the static type is an interface, use it
cl = staticType;
} else {
// We can use the static type, and that is OK, but we'll trace
// back the java class chain here to look for public superclass
// comming before staticType
cl = getPublicSuperclass(dynamicType);
if (cl == null) {
// Can happen if dynamicType is interface
cl = dynamicType;
}
}
}
for (;;) {
members = (JavaMembers)ct.get(cl);
if (members != null) {
return members;
}
try {
members = new JavaMembers(scope, cl);
break;
@ -631,16 +606,15 @@ class JavaMembers
// Reflection may fail for objects that are in a restricted
// access package (e.g. sun.*). If we get a security
// exception, try again with the static type if it is interface.
// Otherwise, try public superclass
// Otherwise, try superclass
if (staticType != null && staticType.isInterface()) {
cl = staticType;
staticType = null; // try staticType only once
continue;
}
Class parent = getPublicSuperclass(cl);
} else {
Class parent = cl.getSuperclass();
if (parent == null) {
if (cl.isInterface()) {
// last resort
// last resort after failed staticType interface
parent = ScriptRuntime.ObjectClass;
} else {
throw e;
@ -649,26 +623,13 @@ class JavaMembers
cl = parent;
}
}
}
if (Context.isCachingEnabled)
ct.put(cl, members);
return members;
}
private static Class getPublicSuperclass(Class cl)
{
if (cl == ScriptRuntime.ObjectClass) {
return null;
}
do {
cl = cl.getSuperclass();
if (cl == null || cl == ScriptRuntime.ObjectClass) {
break;
}
} while (!Modifier.isPublic(cl.getModifiers()));
return cl;
}
RuntimeException reportMemberNotFound(String memberName)
{
return Context.reportRuntimeError2(