Changeset 78337 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2019 8:30:19 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/memsafer: Added RTMemSaferGetSize.

Location:

trunk/src/VBox/Runtime

Files:

• generic/memsafer-generic.cpp (modified) (1 diff)
• r3/memsafer-r3.cpp (modified) (2 diffs)

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

@@ -150 +150 @@
     if (pv)
     {
-        Assert(cb);
+        Assert(cb); /* does not support openssl. */
         void *pvStart = (char *)pv - RTMEMSAFER_PAD_BEFORE;
         AssertMsg(*(size_t *)pvStart == cb, ("*pvStart=%#zx cb=%#zx\n", *(size_t *)pvStart, cb));

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

@@ -442 +442 @@
         PRTMEMSAFERNODE pThis = rtMemSaferNodeRemove(pv);
         AssertReturnVoid(pThis);
-        AssertMsg(cb == pThis->cbUser, ("cb=%#zx != %#zx\n", cb, pThis->cbUser));
+        if (cb == 0) /* for openssl use */
+            cb = pThis->cbUser;
+        else
+            AssertMsg(cb == pThis->cbUser, ("cb=%#zx != %#zx\n", cb, pThis->cbUser));
 
         /*
@@ -485 +488 @@
 }
 RT_EXPORT_SYMBOL(RTMemSaferFree);
+
+
+RTDECL(size_t) RTMemSaferGetSize(void *pv) RT_NO_THROW_DEF
+{
+    size_t cbRet = 0;
+    if (pv)
+    {
+        void *pvKey = rtMemSaferScramblePointer(pv);
+        RTCritSectRwEnterShared(&g_MemSaferCritSect);
+        PRTMEMSAFERNODE pThis = (PRTMEMSAFERNODE)RTAvlPVGet(&g_pMemSaferTree, pvKey);
+        if (pThis)
+            cbRet = pThis->cbUser;
+        RTCritSectRwLeaveShared(&g_MemSaferCritSect);
+    }
+    return cbRet;
+}
+RT_EXPORT_SYMBOL(RTMemSaferGetSize);