Skip to content

[release/10.0] Fix Mono AOT crash on struct fields with unsupported marshal conversion #125618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+8 −2
Open

[release/10.0] Fix Mono AOT crash on struct fields with unsupported marshal conversion #125618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/mono/mono/metadata/marshal-shared.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,14 @@ mono_marshal_shared_emit_struct_conv_full (MonoMethodBuilder *mb, MonoClass *kla
mono_mb_emit_stloc (mb, 1);
break;
}
case MONO_TYPE_OBJECT: {
char *msg = g_strdup_printf ("COM support was disabled at compilation time.");
case MONO_TYPE_OBJECT:
case MONO_TYPE_STRING:
case MONO_TYPE_CLASS:
case MONO_TYPE_SZARRAY:
case MONO_TYPE_ARRAY: {
char *msg = g_strdup_printf ("Type %s with field type %s cannot be marshaled as an unmanaged struct field.",
mono_type_full_name (m_class_get_byval_arg (klass)),
mono_type_full_name (ftype));
mono_marshal_shared_mb_emit_exception_marshal_directive (mb, msg);
break;
}
Expand Down
Loading