diff options
| author | Andrew Haley <aph@gcc.gnu.org> | 2007-01-29 13:14:38 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-01-29 13:14:38 +0000 |
| commit | 6b05e79165f6d8c5660a874d77f87da41ca934c9 (patch) | |
| tree | 40df469186ef32efb4fe4cfc7ff23eb2b0c7e713 /libjava/java/lang/natVMClassLoader.cc | |
| parent | 2631dfddd2d1492ded5836b7385d3754c9cca33f (diff) | |
| download | gcc-6b05e79165f6d8c5660a874d77f87da41ca934c9.zip gcc-6b05e79165f6d8c5660a874d77f87da41ca934c9.tar.gz gcc-6b05e79165f6d8c5660a874d77f87da41ca934c9.tar.bz2 | |
natClass.cc (initializeClass): Re-throw SecurityExceptions.
2007-01-26 Andrew Haley <aph@redhat.com>
* java/lang/natClass.cc (initializeClass): Re-throw
SecurityExceptions.
* java/lang/natVMClassLoader.cc (loadClass): checkPackageAccess.
* java/lang/ClassLoader.java: (loadClass): Likewise.
From-SVN: r121285
Diffstat (limited to 'libjava/java/lang/natVMClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index 2db2429..3e5ff3e 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -32,8 +32,10 @@ details. */ #include <java/security/ProtectionDomain.h> #include <java/lang/ClassFormatError.h> #include <java/lang/StringBuffer.h> +#include <java/lang/SecurityManager.h> #include <java/lang/Runtime.h> #include <java/util/HashSet.h> +#include <java/lang/SecurityException.h> #include <java/lang/VirtualMachineError.h> java::lang::Class * @@ -204,6 +206,16 @@ java::lang::VMClassLoader::nativeFindClass (jstring name) jclass java::lang::VMClassLoader::loadClass(jstring name, jboolean resolve) { + using namespace ::java::lang; + + SecurityManager *sm = (SecurityManager *)SecurityManager::current; + if (sm) + { + jint lastDot = name->lastIndexOf('.'); + if (lastDot != -1) + sm->checkPackageAccess(name->substring(0, lastDot)); + } + // We try the boot loader first, so that the endorsed directory // overrides compiled-in classes. jclass klass = NULL; |