Changeset 79561 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Jul 5, 2019 7:37:47 PM (6 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp

@@ -141 +141 @@
     Assert(strchr(pszFilename, '/') == NULL);
 
-    /* Easy if suffix was included. */
+    uint32_t const fFlags2 = fFlags & ~(RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK | RTLDRLOAD_FLAGS_SO_VER_END_MASK);
+
+    /*
+     * If no suffix is given and we haven't got any RTLDRLOAD_FLAGS_SO_VER_ range to work
+     * with, we can call RTLdrLoadEx directly.
+     */
     if (!pszExt)
-        return RTLdrLoadEx(pszFilename, phLdrMod, fFlags, NULL);
+    {
+#if !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
+        if (    (fFlags & RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK) >> RTLDRLOAD_FLAGS_SO_VER_BEGIN_SHIFT
+             == (fFlags & RTLDRLOAD_FLAGS_SO_VER_END_MASK)   >> RTLDRLOAD_FLAGS_SO_VER_END_SHIFT)
+#endif
+            return RTLdrLoadEx(pszFilename, phLdrMod, fFlags2, NULL);
+        pszExt = "";
+    }
 
-    /* Combine filename and suffix and then do the loading. */
+    /*
+     * Combine filename and suffix and then do the loading.
+     */
     size_t const cchFilename = strlen(pszFilename);
     size_t const cchSuffix   = strlen(pszExt);
@@ -153 +167 @@
     pszTmp[cchFilename + cchSuffix] = '\0';
 
-    int rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags, NULL);
+    int rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags2, NULL);
 
 #if !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
@@ -165 +179 @@
         if (pszActualSuff && strcmp(pszActualSuff, ".so") == 0)
         {
-            uint32_t const uBegin = (fFlags & RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK) >> RTLDRLOAD_FLAGS_SO_VER_BEGIN_SHIFT;
-            uint32_t const uEnd   = (fFlags & RTLDRLOAD_FLAGS_SO_VER_END_MASK)   >> RTLDRLOAD_FLAGS_SO_VER_END_SHIFT;
-            int32_t const  iIncr  = uBegin <= uEnd ? 1 : -1;
-            for (uint32_t uMajorVer = uBegin; uMajorVer != uEnd; uMajorVer += iIncr)
+            int32_t const iBegin    = (fFlags & RTLDRLOAD_FLAGS_SO_VER_BEGIN_MASK) >> RTLDRLOAD_FLAGS_SO_VER_BEGIN_SHIFT;
+            int32_t const iEnd      = (fFlags & RTLDRLOAD_FLAGS_SO_VER_END_MASK)   >> RTLDRLOAD_FLAGS_SO_VER_END_SHIFT;
+            int32_t const iIncr     = iBegin <= iEnd ? 1 : -1;
+            for (int32_t  iMajorVer = iBegin; iMajorVer != iEnd; iMajorVer += iIncr)
             {
-                RTStrPrintf(&pszTmp[cchFilename + cchSuffix], 16 + 1, ".%u", uMajorVer);
-                rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags, NULL);
+                RTStrPrintf(&pszTmp[cchFilename + cchSuffix], 16 + 1, ".%d", iMajorVer);
+                rc = RTLdrLoadEx(pszTmp, phLdrMod, fFlags2, NULL);
                 if (RT_SUCCESS(rc))
                     break;