Fix memory leaked caused by Marshal.GetFunctionPointerForDelegate (#28074)

AaronRobinsonMSFT · web-flow · commit f897710bc4ef · 2020-08-11T16:52:55.000-07:00
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()

Original file line number	Diff line number	Diff line change
`@@ -961,11 +961,18 @@ void UMEntryThunk::Terminate()`
`961`	`961`	`CONTRACTL`
`962`	`962`	`{`
`963`	`963`	`NOTHROW;`
	`964`	`+ MODE_ANY;`
`964`	`965`	`}`
`965`	`966`	`CONTRACTL_END;`
`966`	`967`
`967`	`968`	`m_code.Poison();`
`968`	`969`
	`970`	`+ if (GetObjectHandle())`
	`971`	`+ {`
	`972`	`+ DestroyLongWeakHandle(GetObjectHandle());`
	`973`	`+ m_pObjectHandle = 0;`
	`974`	`+ }`
	`975`	`+`
`969`	`976`	`s_thunkFreeList.AddToList(this);`
`970`	`977`	`}`
`971`	`978`