From fa81228a4806949dd3858827734762bd9f82cb56 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Wed, 8 Apr 2020 19:22:59 -0400 Subject: [PATCH] [metadata] Handle MONO_TYPE_FNPTR case in collect_type_images (#34517) Fixes abort when PTR-FNPTR field signature is encountered. I do not have a deep understanding of how the code in this area works, but I have called the function that appears most consistent with how other signatures are being handled. Fixes mono/mono#12098 Fixes mono/mono#17113 Fixes mono/mono#19433 Co-authored-by: whydoubt --- src/mono/mono/metadata/metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/metadata/metadata.c b/src/mono/mono/metadata/metadata.c index 5734b9f..6b659fc 100644 --- a/src/mono/mono/metadata/metadata.c +++ b/src/mono/mono/metadata/metadata.c @@ -3054,8 +3054,8 @@ retry: type = m_class_get_byval_arg (type->data.array->eklass); goto retry; case MONO_TYPE_FNPTR: - //return signature_in_image (type->data.method, image); - g_assert_not_reached (); + collect_signature_images (type->data.method, data); + break; case MONO_TYPE_VAR: case MONO_TYPE_MVAR: { -- 2.7.4