get_method_module_path

dotnet · May 15, 2020 · f71f944 · f71f944
1 parent ba0e584
commit f71f944
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/installer/corehost/cli/fxr/hostfxr.cpp b/src/installer/corehost/cli/fxr/hostfxr.cpp
@@ -438,7 +438,7 @@ namespace
         if (startup_info.dotnet_root.empty())
         {
             pal::string_t mod_path;
-            if (!pal::get_own_module_path(&mod_path))
+            if (!pal::get_method_module_path(&mod_path, (void*)&hostfxr_set_error_writer))
                 return StatusCode::CoreHostCurHostFindFailure;
 
             startup_info.dotnet_root = get_dotnet_root_from_fxr_path(mod_path);

diff --git a/src/installer/corehost/cli/hostmisc/pal.h b/src/installer/corehost/cli/hostmisc/pal.h
@@ -272,6 +272,7 @@ namespace pal
 
     bool get_own_executable_path(string_t* recv);
     bool get_own_module_path(string_t* recv);
+    bool get_method_module_path(string_t* recv, void* method);
     bool get_module_path(dll_t mod, string_t* recv);
     bool get_current_module(dll_t *mod);
     bool getenv(const char_t* name, string_t* recv);

diff --git a/src/installer/corehost/cli/hostmisc/pal.unix.cpp b/src/installer/corehost/cli/hostmisc/pal.unix.cpp
@@ -788,6 +788,16 @@ bool pal::get_own_module_path(string_t* recv)
     return true;
 }
 
+bool pal::get_method_module_path(string_t* recv, void* method)
+{
+    Dl_info info;
+    if (dladdr(method, &info) == 0)
+        return false;
+
+    recv->assign(info.dli_fname);
+    return true;
+}
+
 bool pal::get_module_path(dll_t module, string_t* recv)
 {
     return false;

diff --git a/src/installer/corehost/cli/hostmisc/pal.windows.cpp b/src/installer/corehost/cli/hostmisc/pal.windows.cpp
@@ -553,6 +553,16 @@ bool pal::get_own_module_path(string_t* recv)
     return GetModuleFileNameWrapper(hmod, recv);
 }
 
+bool pal::get_method_module_path(string_t* recv, void* method)
+{
+    HMODULE hmod;
+    if (!GetModuleHandleFromAddress(method, &hmod))
+        return false;
+
+    return GetModuleFileNameWrapper(hmod, recv);
+}
+
+
 bool pal::get_module_path(dll_t mod, string_t* recv)
 {
     return GetModuleFileNameWrapper(mod, recv);