зеркало из https://github.com/mozilla/gecko-dev.git
Allow null returns from SecuritySupport methods if someone only
wants to implement LiveConnect filtering
This commit is contained in:
nboyd%atg.com
Родитель
3e5ae4d5dc
Коммит
d52574f9e0
|
|
@ -1754,14 +1754,16 @@ public final class Context {
|
|||
Object result = null;
|
||||
if (securitySupport != null) {
|
||||
Class[] classes = securitySupport.getClassContext();
|
||||
if (depth != -1) {
|
||||
int depth1 = depth + 1;
|
||||
result = getSecurityDomainFromClass(classes[depth1]);
|
||||
} else {
|
||||
for (int i=1; i < classes.length; i++) {
|
||||
result = getSecurityDomainFromClass(classes[i]);
|
||||
if (result != null)
|
||||
break;
|
||||
if (classes != null) {
|
||||
if (depth != -1) {
|
||||
int depth1 = depth + 1;
|
||||
result = getSecurityDomainFromClass(classes[depth1]);
|
||||
} else {
|
||||
for (int i=1; i < classes.length; i++) {
|
||||
result = getSecurityDomainFromClass(classes[i]);
|
||||
if (result != null)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -283,17 +283,18 @@ public class JavaAdapter extends ScriptableObject {
|
|||
SecuritySupport ss = cx.getSecuritySupport();
|
||||
if (ss != null) {
|
||||
Object securityDomain = cx.getSecurityDomainForStackDepth(-1);
|
||||
return ss.defineClass(adapterName, bytes, securityDomain);
|
||||
} else {
|
||||
if (classLoader == null)
|
||||
classLoader = new MyClassLoader();
|
||||
classLoader.defineClass(adapterName, bytes);
|
||||
return classLoader.loadClass(adapterName, true);
|
||||
Class result = ss.defineClass(adapterName, bytes, securityDomain);
|
||||
if (result != null)
|
||||
return result;
|
||||
}
|
||||
if (classLoader == null)
|
||||
classLoader = new MyClassLoader();
|
||||
classLoader.defineClass(adapterName, bytes);
|
||||
return classLoader.loadClass(adapterName, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility method, which dynamically binds a Context to the current thread,
|
||||
* Utility method which dynamically binds a Context to the current thread,
|
||||
* if none already exists.
|
||||
*/
|
||||
public static Object callMethod(Scriptable object, Object thisObj,
|
||||
|
|
|
|||
|
|
@ -118,17 +118,18 @@ public class Codegen extends Interpreter {
|
|||
}
|
||||
}
|
||||
try {
|
||||
Class clazz;
|
||||
if (securitySupport == null) {
|
||||
Class clazz = null;
|
||||
if (securitySupport != null) {
|
||||
clazz = securitySupport.defineClass(name, classFile,
|
||||
securityDomain);
|
||||
}
|
||||
if (clazz == null) {
|
||||
Context.checkSecurityDomainRequired();
|
||||
if (classLoader == null)
|
||||
classLoader = new JavaScriptClassLoader();
|
||||
clazz = classLoader.defineClass(name, classFile);
|
||||
ClassLoader loader = clazz.getClassLoader();
|
||||
clazz = loader.loadClass(name);
|
||||
} else {
|
||||
clazz = securitySupport.defineClass(name, classFile,
|
||||
securityDomain);
|
||||
}
|
||||
if (name.equals(generatedName))
|
||||
result = clazz;
|
||||
|
|
|
|||
|
|
@ -1754,14 +1754,16 @@ public final class Context {
|
|||
Object result = null;
|
||||
if (securitySupport != null) {
|
||||
Class[] classes = securitySupport.getClassContext();
|
||||
if (depth != -1) {
|
||||
int depth1 = depth + 1;
|
||||
result = getSecurityDomainFromClass(classes[depth1]);
|
||||
} else {
|
||||
for (int i=1; i < classes.length; i++) {
|
||||
result = getSecurityDomainFromClass(classes[i]);
|
||||
if (result != null)
|
||||
break;
|
||||
if (classes != null) {
|
||||
if (depth != -1) {
|
||||
int depth1 = depth + 1;
|
||||
result = getSecurityDomainFromClass(classes[depth1]);
|
||||
} else {
|
||||
for (int i=1; i < classes.length; i++) {
|
||||
result = getSecurityDomainFromClass(classes[i]);
|
||||
if (result != null)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -283,17 +283,18 @@ public class JavaAdapter extends ScriptableObject {
|
|||
SecuritySupport ss = cx.getSecuritySupport();
|
||||
if (ss != null) {
|
||||
Object securityDomain = cx.getSecurityDomainForStackDepth(-1);
|
||||
return ss.defineClass(adapterName, bytes, securityDomain);
|
||||
} else {
|
||||
if (classLoader == null)
|
||||
classLoader = new MyClassLoader();
|
||||
classLoader.defineClass(adapterName, bytes);
|
||||
return classLoader.loadClass(adapterName, true);
|
||||
Class result = ss.defineClass(adapterName, bytes, securityDomain);
|
||||
if (result != null)
|
||||
return result;
|
||||
}
|
||||
if (classLoader == null)
|
||||
classLoader = new MyClassLoader();
|
||||
classLoader.defineClass(adapterName, bytes);
|
||||
return classLoader.loadClass(adapterName, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility method, which dynamically binds a Context to the current thread,
|
||||
* Utility method which dynamically binds a Context to the current thread,
|
||||
* if none already exists.
|
||||
*/
|
||||
public static Object callMethod(Scriptable object, Object thisObj,
|
||||
|
|
|
|||
|
|
@ -118,17 +118,18 @@ public class Codegen extends Interpreter {
|
|||
}
|
||||
}
|
||||
try {
|
||||
Class clazz;
|
||||
if (securitySupport == null) {
|
||||
Class clazz = null;
|
||||
if (securitySupport != null) {
|
||||
clazz = securitySupport.defineClass(name, classFile,
|
||||
securityDomain);
|
||||
}
|
||||
if (clazz == null) {
|
||||
Context.checkSecurityDomainRequired();
|
||||
if (classLoader == null)
|
||||
classLoader = new JavaScriptClassLoader();
|
||||
clazz = classLoader.defineClass(name, classFile);
|
||||
ClassLoader loader = clazz.getClassLoader();
|
||||
clazz = loader.loadClass(name);
|
||||
} else {
|
||||
clazz = securitySupport.defineClass(name, classFile,
|
||||
securityDomain);
|
||||
}
|
||||
if (name.equals(generatedName))
|
||||
result = clazz;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче