From b2d9dac0d44b21ec3de4fcada196610500763cca Mon Sep 17 00:00:00 2001 From: monojenkins Date: Thu, 23 Jul 2020 20:58:24 -0400 Subject: [PATCH] [aot] Avoid a crash in generic sharing for invalid generic instances. Fixes https://github.com/mono/mono/issues/20138. (#39869) Co-authored-by: vargaz --- src/mono/mono/mini/mini-generic-sharing.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/mono/mini/mini-generic-sharing.c b/src/mono/mono/mini/mini-generic-sharing.c index 8c04213..5fb8bbb 100644 --- a/src/mono/mono/mini/mini-generic-sharing.c +++ b/src/mono/mono/mini/mini-generic-sharing.c @@ -1170,6 +1170,8 @@ get_wrapper_shared_vtype (MonoType *t) if ((mono_class_get_flags (klass) & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT) return NULL; mono_class_setup_fields (klass); + if (mono_class_has_failure (klass)) + return NULL; int num_fields = mono_class_get_field_count (klass); MonoClassField *klass_fields = m_class_get_fields (klass); -- 2.7.4