procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natClass.cc (_Jv_IsAssignableFrom): Checking the ancestors array is invalid for interfaces...

Browse source 
* java/lang/natClass.cc (_Jv_IsAssignableFrom):  Checking the
	ancestors array is invalid for interfaces, so do that *after*
	check that the target type is not an interface.

From-SVN: r40797
This commit is contained in:
Per Bothner 2001-03-23 16:21:24 -08:00 • committed by Per Bothner
parent 7238de5c34
commit 7a3155bef7
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2001-03-23 Per Bothner <per@bothner.com>
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Checking the
ancestors array is invalid for interfaces, so do that *after*
check that the target type is not an interface.
2000-03-23 Jeff Sturm <jsturm@one-point.com>
* prims.cc (_Jv_FindClassFromSignature): Check return of

17
libjava/java/lang/natClass.cc
View file

@ -909,11 +909,8 @@ _Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
jboolean
_Jv_IsAssignableFrom (jclass target, jclass source)
{
if (source == target
|| (target == &ObjectClass && !source->isPrimitive())
|| (source->ancestors != NULL
&& source->ancestors[source->depth - target->depth] == target))
return true;
if (source == target)
return true;
// If target is array, so must source be.
if (target->isArray ())
@ -945,9 +942,15 @@ _Jv_IsAssignableFrom (jclass target, jclass source)
&& cl_idt->cls.itable[offset] == target)
return true;
}
return false;
}
return false;
if ((target == &ObjectClass && !source->isPrimitive())
|| (source->ancestors != NULL
&& source->ancestors[source->depth - target->depth] == target))
return true;
return false;
}
// Interface type checking, the slow way. Returns TRUE if IFACE is a