diff options
| author | Aleksey Kliger (λgeek) <akliger@gmail.com> | 2018-10-19 21:11:31 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-10-22 19:24:57 +0300 |
| commit | 32d1539629f2be825e18153097a0b8b9501d2e32 (patch) | |
| tree | ba565109579f1124c7c844ede02d377a1d7ea9f4 | |
| parent | c0fe724379084be07e0e0f66a6340167ebab8bcf (diff) | |
[runtime] Don't init classes in ves_icall_RuntimeTypeHandle_is_subclass_ofmono-5.16.0.201
We must not get a TLE if referenced types are in an assembly that can't be
loaded.
Backported fix of https://github.com/mono/mono/issues/11123
| -rw-r--r-- | mono/metadata/icall.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index 03752fd9730..624e550f1ce 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -1814,12 +1814,7 @@ ves_icall_RuntimeTypeHandle_is_subclass_of (MonoType *childType, MonoType *baseT MonoClass *baseClass; childClass = mono_class_from_mono_type (childType); - mono_class_init_checked (childClass, error); - goto_if_nok (error, done); - baseClass = mono_class_from_mono_type (baseType); - mono_class_init_checked (baseClass, error); - goto_if_nok (error, done); if (G_UNLIKELY (childType->byref)) { result = !baseType->byref && baseClass == mono_defaults.object_class; |