1 files changed, 13 insertions, 0 deletions
diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp
index eed690454d..2ee15f675d 100644
--- a/src/vm/dllimport.cpp
+++ b/src/vm/dllimport.cpp
@@ -46,6 +46,10 @@
 #include "compile.h"
 #endif // FEATURE_PREJIT
 
+#ifdef TIZEN_ASAN_ENVIRONMENT
+#include <tizenasanenv.h>
+#endif // TIZEN_ASAN_ENVIRONMENT
+
 #include "eventtrace.h"
 #include "clr/fs/path.h"
 using namespace clr::fs;
@@ -6696,6 +6700,15 @@ VOID NDirect::NDirectLink(NDirectMethodDesc *pMD)
         LPVOID pvTarget = NDirectGetEntryPoint(pMD, hmod);
         if (pvTarget)
         {
+#ifdef TIZEN_ASAN_ENVIRONMENT
+            if (PAL_IsSanitizedLibraryDirect(hmod))
+            {
+                pvTarget = TizenASanEnv::CreateWrapper(pvTarget,
+                                                       TizenASanEnv::PushAndEnableASan,
+                                                       TizenASanEnv::PopAndDisableASan);
+            }
+#endif // TIZEN_ASAN_ENVIRONMENT
+
             pMD->SetNDirectTarget(pvTarget);
             fSuccess = TRUE;
         }