From 8b4823d197c155baae16734c5d538f0e2e66ec8f Mon Sep 17 00:00:00 2001
From: mateoatr <matorre@microsoft.com>
Date: Mon, 9 Dec 2019 19:30:11 +0000
Subject: [PATCH] Poison code before deleting the handle. Keep code consistent.

---
 src/coreclr/src/vm/dllimportcallback.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/src/vm/dllimportcallback.cpp b/src/coreclr/src/vm/dllimportcallback.cpp
index 00ad444..2f6c009 100644
--- a/src/coreclr/src/vm/dllimportcallback.cpp
+++ b/src/coreclr/src/vm/dllimportcallback.cpp
@@ -965,14 +965,14 @@ void UMEntryThunk::Terminate()
     }
     CONTRACTL_END;
 
+    m_code.Poison();
+
     if (GetObjectHandle())
     {
         DestroyLongWeakHandle(GetObjectHandle());
-        this->m_pObjectHandle = 0;
+        m_pObjectHandle = 0;
     }
 
-    m_code.Poison();
-
     s_thunkFreeList.AddToList(this);
 }
 
-- 
2.7.4