diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-29 13:14:38 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-29 13:14:38 +0000 |
| commit | abf353fb5f2cb275f93170b048ebfcccf73d9e39 (patch) | |
| tree | 40df469186ef32efb4fe4cfc7ff23eb2b0c7e713 /libjava/java/lang/natClass.cc | |
| parent | afac7ab4964e200686c4b1e79a37d5fde48d75ec (diff) | |
| download | ppe42-gcc-abf353fb5f2cb275f93170b048ebfcccf73d9e39.tar.gz ppe42-gcc-abf353fb5f2cb275f93170b048ebfcccf73d9e39.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121285 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/natClass.cc')
| -rw-r--r-- | libjava/java/lang/natClass.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 8ac72a403a4..8af533b7769 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -50,6 +50,7 @@ details. */ #include <java/lang/NullPointerException.h> #include <java/lang/RuntimePermission.h> #include <java/lang/System.h> +#include <java/lang/SecurityException.h> #include <java/lang/SecurityManager.h> #include <java/lang/StringBuffer.h> #include <java/lang/VMClassLoader.h> @@ -690,6 +691,10 @@ java::lang::Class::initializeClass (void) { _Jv_Linker::wait_for_state(this, JV_STATE_LINKED); } + catch (java::lang::SecurityException *x) + { + throw x; + } catch (java::lang::Throwable *x) { // Turn into a NoClassDefFoundError. @@ -727,6 +732,10 @@ java::lang::Class::initializeClass (void) { _Jv_InitClass (superclass); } + catch (java::lang::SecurityException *x) + { + throw x; + } catch (java::lang::Throwable *except) { // Caught an exception. @@ -745,6 +754,10 @@ java::lang::Class::initializeClass (void) if (meth) ((void (*) (void)) meth->ncode) (); } + catch (java::lang::SecurityException *x) + { + throw x; + } catch (java::lang::Throwable *except) { if (! java::lang::Error::class$.isInstance(except)) |
