diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-05 09:46:36 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-06-05 09:46:36 +0000 |
| commit | 1e462f350980e1079c0ec24192a305524a0d2b89 (patch) | |
| tree | 7bfa2a39962af82d451049cd9cf8ab4cf2159e32 /libjava/java | |
| parent | 429a176bf91e16daa8d3334af0707db24ad6f44d (diff) | |
| download | ppe42-gcc-1e462f350980e1079c0ec24192a305524a0d2b89.tar.gz ppe42-gcc-1e462f350980e1079c0ec24192a305524a0d2b89.zip | |
2001-06-05 Martin Kahlert <martin.kahlert@infineon.com>
Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Ensure that ancestors
table index is within allowed bounds. Ensure that we dont try to access
class itable at a negative offset. Avoid an ancestor table lookup if
source is a primitive type class.
(isInstance): Remove redundant isPrimitive() check.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42898 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natClass.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index e88bd830967..d6fb3ab7d85 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -633,7 +633,7 @@ java::lang::Class::isAssignableFrom (jclass klass) jboolean java::lang::Class::isInstance (jobject obj) { - if (__builtin_expect (! obj || isPrimitive (), false)) + if (! obj) return false; _Jv_InitClass (this); return _Jv_IsAssignableFrom (this, JV_CLASS (obj)); @@ -939,19 +939,29 @@ _Jv_IsAssignableFrom (jclass target, jclass source) if (cl_iindex < if_idt->iface.ioffsets[0]) { jshort offset = if_idt->iface.ioffsets[cl_iindex]; - if (offset < cl_idt->cls.itable_length + if (offset != -1 && offset < cl_idt->cls.itable_length && cl_idt->cls.itable[offset] == target) return true; } return false; } - if ((target == &ObjectClass && !source->isPrimitive()) - || (source->ancestors != NULL - && source->ancestors[source->depth - target->depth] == target)) + // Primitive TYPE classes are only assignable to themselves. + if (__builtin_expect (target->isPrimitive(), false)) + return false; + + if (target == &ObjectClass) + { + if (source->isPrimitive()) + return false; + return true; + } + else if (source->ancestors != NULL + && source->depth >= target->depth + && source->ancestors[source->depth - target->depth] == target) return true; - return false; + return false; } // Interface type checking, the slow way. Returns TRUE if IFACE is a |
