Changeset 79559 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Jul 5, 2019 3:42:51 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131847

Message:

IPRT/process-creation-posix.cpp: Try to dynamically resolve crypt_r on linux. [adjustments] ticketref:18682

File:

• trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp

@@ -179 +179 @@
 RTDECL(int) RTLdrLoadSystem(const char *pszFilename, bool fNoUnload, PRTLDRMOD phLdrMod)
 {
-    LogFlow(("RTLdrLoadSystem: pszFilename=%p:{%s} fNoUnload=%RTbool phLdrMod=%p\n",
-             pszFilename, pszFilename, fNoUnload, phLdrMod));
+    return RTLdrLoadSystemEx(pszFilename, fNoUnload ? RTLDRLOAD_FLAGS_NO_UNLOAD : 0, phLdrMod);
+}
+
+
+RTDECL(int) RTLdrLoadSystemEx(const char *pszFilename, uint32_t fFlags, PRTLDRMOD phLdrMod)
+{
+    LogFlow(("RTLdrLoadSystemEx: pszFilename=%p:{%s} fFlags=%#RX32 phLdrMod=%p\n", pszFilename, pszFilename, fFlags, phLdrMod));
 
     /*
@@ -189 +194 @@
     AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
     AssertMsgReturn(!RTPathHasPath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fFlags & ~(RTLDRLOAD_FLAGS_VALID_MASK | RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK | RTLDRLOAD_FLAGS_SO_VER_END_MASK)),
+                    ("fFlags=%#RX32\n", fFlags), VERR_INVALID_FLAGS);
 
     /*
@@ -203 +210 @@
      * Let the platform specific code do the rest.
      */
-    int rc = rtldrNativeLoadSystem(pszFilename, pszSuffix, fNoUnload ? RTLDRLOAD_FLAGS_NO_UNLOAD : 0, phLdrMod);
+    int rc = rtldrNativeLoadSystem(pszFilename, pszSuffix, fFlags, phLdrMod);
     LogFlow(("RTLdrLoadSystem: returns %Rrc\n", rc));
     return rc;
@@ -211 +218 @@
 RTDECL(void *) RTLdrGetSystemSymbol(const char *pszFilename, const char *pszSymbol)
 {
+    return RTLdrGetSystemSymbolEx(pszFilename, pszSymbol, RTLDRLOAD_FLAGS_NO_UNLOAD);
+}
+
+
+RTDECL(void *) RTLdrGetSystemSymbolEx(const char *pszFilename, const char *pszSymbol, uint32_t fFlags)
+{
     void    *pvRet = NULL;
     RTLDRMOD hLdrMod;
-    int rc = RTLdrLoadSystem(pszFilename, true /*fNoUnload*/, &hLdrMod);
+    int rc = RTLdrLoadSystemEx(pszFilename, fFlags | RTLDRLOAD_FLAGS_NO_UNLOAD, &hLdrMod);
     if (RT_SUCCESS(rc))
     {