Changeset 78417 in vbox for trunk/src

Timestamp:

May 6, 2019 11:24:31 PM (6 years ago)

Author:

vboxsync

Message:

Utf8Str,RTCString: Assert that C-string pointer parameters in assignment type operations don't point into the object they're being assigned to, as that will lead to use-afer-free situations. bugref:9448

Location:

trunk/src/VBox

Files:

• Main/glue/string.cpp (modified) (2 diffs)
• Runtime/common/string/ministring.cpp (modified) (8 diffs)

trunk/src/VBox/Main/glue/string.cpp

@@ -328 +328 @@
  * @param   a_pcszSrc   The source string.
  * @param   a_offSrc    Start offset to copy from.
- * @param   a_cchSrc    The source string.
+ * @param   a_cchSrc    How much to copy
  * @returns S_OK or E_OUTOFMEMORY.
  *
@@ -336 +336 @@
 HRESULT Utf8Str::copyFromExNComRC(const char *a_pcszSrc, size_t a_offSrc, size_t a_cchSrc)
 {
+    Assert(!a_cchSrc || !m_psz || (uintptr_t)&a_pcszSrc[a_offSrc] - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
     cleanup();
     if (a_cchSrc)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -56 +56 @@
 RTCString &RTCString::assign(const RTCString &a_rSrc)
 {
+    Assert(&a_rSrc != this);
     size_t const cchSrc = a_rSrc.length();
     if (cchSrc > 0)
@@ -98 +99 @@
         if (cchSrc)
         {
+            Assert((uintptr_t)&a_pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
             reserve(cchSrc + 1);
             memcpy(m_psz, a_pszSrc, cchSrc);
@@ -116 +119 @@
         if (cchSrc)
         {
+            Assert((uintptr_t)&a_pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
             int rc = reserveNoThrow(cchSrc + 1);
             if (RT_SUCCESS(rc))
@@ -176 +181 @@
     {
         a_cchSrc = RTStrNLen(a_pszSrc, a_cchSrc);
-        reserve(a_cchSrc + 1);
-        memcpy(m_psz, a_pszSrc, a_cchSrc);
-        m_psz[a_cchSrc] = '\0';
-        m_cch = a_cchSrc;
-    }
-    else
-        setNull();
-    return *this;
-}
-
-int RTCString::assignNoThrow(const char *a_pszSrc, size_t a_cchSrc) RT_NOEXCEPT
-{
-    if (a_cchSrc)
-    {
-        a_cchSrc = RTStrNLen(a_pszSrc, a_cchSrc);
-        int rc = reserveNoThrow(a_cchSrc + 1);
-        if (RT_SUCCESS(rc))
-        {
+        if (a_cchSrc)
+        {
+            Assert((uintptr_t)&a_pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
+            reserve(a_cchSrc + 1);
             memcpy(m_psz, a_pszSrc, a_cchSrc);
             m_psz[a_cchSrc] = '\0';
             m_cch = a_cchSrc;
-            return VINF_SUCCESS;
-        }
-        return rc;
+            return *this;
+        }
+    }
+    setNull();
+    return *this;
+}
+
+int RTCString::assignNoThrow(const char *a_pszSrc, size_t a_cchSrc) RT_NOEXCEPT
+{
+    if (a_cchSrc)
+    {
+        a_cchSrc = RTStrNLen(a_pszSrc, a_cchSrc);
+        if (a_cchSrc)
+        {
+            Assert((uintptr_t)&a_pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
+            int rc = reserveNoThrow(a_cchSrc + 1);
+            if (RT_SUCCESS(rc))
+            {
+                memcpy(m_psz, a_pszSrc, a_cchSrc);
+                m_psz[a_cchSrc] = '\0';
+                m_cch = a_cchSrc;
+                return VINF_SUCCESS;
+            }
+            return rc;
+        }
     }
     setNull();
@@ -433 +448 @@
     if (cchSrc)
     {
+        Assert((uintptr_t)&pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
         size_t cchThis = length();
         size_t cchBoth = cchThis + cchSrc;
@@ -456 +473 @@
     if (cchSrc)
     {
+        Assert((uintptr_t)&pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated);
+
         size_t cchThis = length();
         size_t cchBoth = cchThis + cchSrc;
@@ -668 +687 @@
 RTCString &RTCString::replaceWorker(size_t offStart, size_t cchLength, const char *pszSrc, size_t cchSrc)
 {
+    Assert((uintptr_t)&pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated || !cchSrc);
+
     /*
      * Our non-standard handling of out_of_range situations.
@@ -710 +731 @@
 int RTCString::replaceWorkerNoThrow(size_t offStart, size_t cchLength, const char *pszSrc, size_t cchSrc) RT_NOEXCEPT
 {
+    Assert((uintptr_t)&pszSrc - (uintptr_t)m_psz >= (uintptr_t)m_cbAllocated || !cchSrc);
+
     /*
      * Our non-standard handling of out_of_range situations.