Changeset 100442 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jul 8, 2023 11:10:51 AM (22 months ago)

Author:

vboxsync

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

158185

Message:

IPRT,OpenSSL: Support ECDSA for verficiation purposes when IPRT links with OpenSSL. This required quite a bit of cleanups, so not entirely no-risk. bugref:10479 ticketref:21621

File:

• trunk/src/VBox/Runtime/r3/memsafer-r3.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/memsafer-r3.cpp

@@ -511 +511 @@
     if (pv)
     {
-        void *pvKey = rtMemSaferScramblePointer(pv);
-        RTCritSectRwEnterShared(&g_MemSaferCritSect);
-        PRTMEMSAFERNODE pThis = (PRTMEMSAFERNODE)RTAvlPVGet(&g_pMemSaferTree, pvKey);
-        if (pThis)
-            cbRet = pThis->cbUser;
-        RTCritSectRwLeaveShared(&g_MemSaferCritSect);
+        /*
+         * We use this API for testing whether pv is a safer allocation or not,
+         * so we may be called before the allocators.  Thus, it's prudent to
+         * make sure initialization has taken place before attempting to enter
+         * the critical section and such.
+         */
+        int rc = RTOnceEx(&g_MemSaferOnce, rtMemSaferOnceInit, rtMemSaferOnceTerm, NULL);
+        if (RT_SUCCESS(rc))
+        {
+            void *pvKey = rtMemSaferScramblePointer(pv);
+            RTCritSectRwEnterShared(&g_MemSaferCritSect);
+            PRTMEMSAFERNODE pThis = (PRTMEMSAFERNODE)RTAvlPVGet(&g_pMemSaferTree, pvKey);
+            if (pThis)
+                cbRet = pThis->cbUser;
+            RTCritSectRwLeaveShared(&g_MemSaferCritSect);
+        }
     }
     return cbRet;