Handle crash when [out] parameter of type Intptr* is passed to delegate (#79763)

When a delegate is passed an [out] parameter of type "intptr *"
it will crash since this data type is not handled in
emit_managed_wrapper_ilgen. This will lead to a crash.
With this fix [out] parameter of type "Intptr *" is handled
after adding an addition case statement to handle MONO_TYPE_PTR
in emit_managed_wrapper_ilgen.

Co-authored-by: Giridhar Trivedi <giridhar.trivedi@in.ibm.com>

diff --git a/src/mono/mono/metadata/marshal-lightweight.c b/src/mono/mono/metadata/marshal-lightweight.c
index 072ddf5e176a32b31d03a595b8da0a7612df77a0..2b8c321fce6f97c55d4f30e37c53e0b9e1a69a41 100644 (file)
--- a/src/mono/mono/metadata/marshal-lightweight.c
+++ b/src/mono/mono/metadata/marshal-lightweight.c
@@ -2629,6 +2629,7 @@ emit_managed_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *invoke_s
                        case MONO_TYPE_SZARRAY:
                        case MONO_TYPE_CLASS:
                        case MONO_TYPE_VALUETYPE:
+                       case MONO_TYPE_PTR:
                                mono_emit_marshal (m, i, invoke_sig->params [i], mspecs [i + 1], tmp_locals [i], NULL, MARSHAL_ACTION_MANAGED_CONV_OUT);
                                break;
                        default:

diff --git a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointer.cs b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointer.cs
index 34e075ad783e148b4f89c48e7a9c5f84b6679cc0..eff4068526eb16c016ec2cd0ee55ed3c9144fdce 100644 (file)
--- a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointer.cs
+++ b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointer.cs
@@ -13,6 +13,9 @@ public partial class FunctionPtr
 
         [DllImport(nameof(FunctionPointerNative))]
         public static extern bool CheckFcnPtr(IntPtr fcnptr);
+
+        [DllImport(nameof(FunctionPointerNative))]
+        static unsafe extern void FillOutPtr(IntPtr* p);
     }
 
     delegate void VoidDelegate();
@@ -56,12 +59,34 @@ public partial class FunctionPtr
         }
     }
 
+
+    [DllImport(nameof(FunctionPointerNative))]
+    static unsafe extern void FillOutPtr(IntPtr* p);
+
+    private unsafe delegate void DelegateToFillOutPtr([Out] IntPtr* p);
+
+    public static void RunGetDelForOutPtrTest()
+    {
+        Console.WriteLine($"Running {nameof(RunGetDelForOutPtrTest)}...");
+        IntPtr outVar = 0;
+        int expectedValue = 60;
+        unsafe
+        {
+            DelegateToFillOutPtr d = new DelegateToFillOutPtr(FillOutPtr);
+            IntPtr ptr = Marshal.GetFunctionPointerForDelegate(d);
+            DelegateToFillOutPtr OutPtrDelegate = Marshal.GetDelegateForFunctionPointer<DelegateToFillOutPtr>(ptr);
+            OutPtrDelegate(&outVar);
+        }
+        Assert.Equal(expectedValue, outVar);
+    }
+
     public static int Main()
     {
         try
         {
             RunGetDelForFcnPtrTest();
             RunGetFcnPtrSingleMulticastTest();
+            RunGetDelForOutPtrTest();
         }
         catch (Exception e)
         {

diff --git a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
index 378a4180399a3f761153006cbc7f6b382b5e8d29..9056f9af2ae72b0dc5e2fb4f76c6b2af0cd3420f 100644 (file)
--- a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
+++ b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <xplatform.h>
 #include <platformdefines.h>
+#include <stdint.h>
 
 namespace
 {
@@ -29,3 +30,8 @@ extern "C" DLL_EXPORT bool CheckFcnPtr(bool(STDMETHODCALLTYPE *fcnptr)(long long
         return fcnptr(999999999999);
     }
 }
+
+extern "C" DLL_EXPORT void FillOutPtr(intptr_t *p)
+{
+    *p = 60;
+}

diff --git a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
index 38d1a61bba72a9dfe1af8b45605487ba3bb13a72..a69510fb96bc158a0245d87c514878957b687342 100644 (file)
--- a/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
+++ b/src/tests/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />