[WIP] Bad, fix, good!

dotnet · Jun 2, 2022 · acbb135 · acbb135
1 parent 4f02758
commit acbb135
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
@@ -325,11 +325,16 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 		}
 
 		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		static extern string? _monodroid_lookup_replacement_type (string jniSimpleReference);
+		static extern IntPtr _monodroid_lookup_replacement_type (string jniSimpleReference);
 
 		protected override string? GetReplacementTypeCore (string jniSimpleReference)
 		{
-			return _monodroid_lookup_replacement_type (jniSimpleReference);
+			IntPtr ret = _monodroid_lookup_replacement_type (jniSimpleReference);
+			if (ret == IntPtr.Zero) {
+				return null;
+			}
+
+			return Marshal.PtrToStringAnsi (ret);
 		}
 
 		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]