Don't free the loader handle if the LoaderAllocator is already dead. (d…

…otnet#25208)
EgorBo · Jun 18, 2019 · 342327a · 342327a
1 parent 96e07e6
commit 342327a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/vm/custommarshalerinfo.cpp b/src/vm/custommarshalerinfo.cpp
@@ -134,11 +134,14 @@ CustomMarshalerInfo::~CustomMarshalerInfo()
 {
     WRAPPER_NO_CONTRACT;
 #ifndef CROSSGEN_COMPILE    
-    if (m_hndCustomMarshaler)
+    if (m_pLoaderAllocator->IsAlive() && m_hndCustomMarshaler)
     {
+        // Only free the LOADERHANDLE if the LoaderAllocator is still alive.
+        // If the loader allocator isn't alive, the handle has automatically
+        // been collected already.
         m_pLoaderAllocator->FreeHandle(m_hndCustomMarshaler);
-        m_hndCustomMarshaler = NULL;
     }
+    m_hndCustomMarshaler = NULL;
 #endif
 }