Skip to content

[runtime] Fix segfault when accessing MonoImage in certain cases #4541

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

Merged
merged 3 commits into from
Apr 9, 2020
Merged

[runtime] Fix segfault when accessing MonoImage in certain cases #4541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc74c4e
[runtime] Fix segfault when accessing MonoImage in certain cases
grendello Apr 8, 2020
e326754
Add unit test
jonpryor Apr 8, 2020
e39ed5b
Fix test.
jonpryor Apr 8, 2020
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: 9 additions & 1 deletion src/Mono.Android/Test/Java.Interop/JnienvTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,23 @@ public void InvokingNullInstanceDoesNotCrashDalvik ()
}

[Test]
public void NewGenericTypeThrows ()
public void NewOpenGenericTypeThrows ()
{
try {
var lrefInstance = JNIEnv.StartCreateInstance (typeof (GenericHolder<>), "()V");
JNIEnv.FinishCreateInstance (lrefInstance, "()V");
Assert.Fail ("SHOULD NOT BE REACHED: creation of open generic types is not supported");
} catch (NotSupportedException) {
}
}

[Test]
public void NewClosedGenericTypeWorks ()
{
using (var holder = new GenericHolder<int>()) {
}
}

[Test]
public void NewObjectArrayWithNullArray ()
{
Expand Down
4 changes: 2 additions & 2 deletions src/monodroid/jni/embedded-assemblies.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ EmbeddedAssemblies::typemap_managed_to_java ([[maybe_unused]] MonoType *type, Mo
{
constexpr char error_message[] = "typemap: unable to find mapping to a Java type from managed type '%s'";

simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (type, MONO_TYPE_NAME_FORMAT_REFLECTION));
simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (type, MONO_TYPE_NAME_FORMAT_FULL_NAME));
MonoImage *image = mono_class_get_image (klass);
const char *image_name = mono_image_get_name (image);
size_t type_name_len = strlen (type_name.get ());
Expand Down Expand Up @@ -490,7 +490,7 @@ EmbeddedAssemblies::typemap_managed_to_java (MonoReflectionType *reflection_type
return nullptr;
}

const char *ret = typemap_managed_to_java (type, mono_type_get_class (type), mvid);
const char *ret = typemap_managed_to_java (type, mono_class_from_mono_type (type), mvid);

if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {
total_time.mark_end ();
Expand Down