Changeset 78337 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

IPRT/memsafer: Added RTMemSaferGetSize.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/memsafer.h (modified) (1 diff)
• src/VBox/Runtime/generic/memsafer-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/memsafer-r3.cpp (modified) (2 diffs)

trunk/include/iprt/mangling.h

@@ -3810 +3810 @@
 # define RTMemSaferAllocZTag                            RT_MANGLER(RTMemSaferAllocZTag)
 # define RTMemSaferFree                                 RT_MANGLER(RTMemSaferFree)
+# define RTMemSaferGetSize                              RT_MANGLER(RTMemSaferGetSize)
 # define RTMemSaferReallocZExTag                        RT_MANGLER(RTMemSaferReallocZExTag)
 # define RTMemSaferReallocZTag                          RT_MANGLER(RTMemSaferReallocZTag)

trunk/include/iprt/memsafer.h

@@ -241 +241 @@
 RTDECL(void) RTMemSaferFree(void *pv, size_t cb) RT_NO_THROW_PROTO;
 
+/**
+ * Gets the amount of memory allocated at @a pv.
+ *
+ * This can be used to check if the allocation was made using an RTMemSafer API.
+ *
+ * @returns Allocation size in bytes, 0 if not a RTMemSafer allocation.
+ * @param   pv          The alleged RTMemSafer allocation.
+ *
+ * @note    Not supported in all contexts and implementations of the API.
+ */
+RTDECL(size_t) RTMemSaferGetSize(void *pv) RT_NO_THROW_PROTO;
+
+
 /** @}  */
 RT_C_DECLS_END

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);