Fix memory leaked caused by Marshal.GetFunctionPointerForDelegate (do…

…tnet#28074)
davmason · Aug 11, 2020 · f897710 · f897710
1 parent d7c967a
commit f897710
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/src/vm/dllimportcallback.cpp b/src/vm/dllimportcallback.cpp
@@ -961,11 +961,18 @@ void UMEntryThunk::Terminate()
     CONTRACTL
     {
         NOTHROW;
+        MODE_ANY;
     }
     CONTRACTL_END;
 
     m_code.Poison();
 
+    if (GetObjectHandle())
+    {
+        DestroyLongWeakHandle(GetObjectHandle());
+        m_pObjectHandle = 0;
+    }
+
     s_thunkFreeList.AddToList(this);
 }
 

diff --git a/src/vm/dllimportcallback.h b/src/vm/dllimportcallback.h
@@ -310,22 +310,6 @@ class UMEntryThunk
 #endif
     }
 
-    ~UMEntryThunk()
-    {
-        CONTRACTL
-        {
-            NOTHROW;
-            GC_NOTRIGGER;
-            MODE_ANY;
-        }
-        CONTRACTL_END;
-
-        if (GetObjectHandle())
-        {
-            DestroyLongWeakHandle(GetObjectHandle());
-        }
-    }
-
     void Terminate();
 
     VOID RunTimeInit()