Changeset 75008 in vbox

Timestamp:

Oct 23, 2018 4:08:44 PM (7 years ago)

Author:

vboxsync

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

126040

Message:

IPRT/RTCString: reserve(1) called on an empty string must allocate memory.

Location:

trunk

Files:

• include/iprt/cpp/ministring.h (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstIprtMiniString.cpp (modified) (1 diff)

trunk/include/iprt/cpp/ministring.h

@@ -244 +244 @@
     void reserve(size_t cb)
     {
-        if (    cb != m_cbAllocated
-             && cb > m_cch + 1
-           )
+        if (   (   cb != m_cbAllocated
+                && cb > m_cch + 1)
+            || (   m_psz == NULL
+                && cb > 0))
         {
             int rc = RTStrRealloc(&m_psz, cb);
@@ -266 +267 @@
     int reserveNoThrow(size_t cb) RT_NOEXCEPT
     {
-        if (    cb != m_cbAllocated
-             && cb > m_cch + 1
-           )
+        if (   (   cb != m_cbAllocated
+                && cb > m_cch + 1)
+            || (   m_psz == NULL
+                && cb > 0))
         {
             int rc = RTStrRealloc(&m_psz, cb);

trunk/src/VBox/Runtime/testcase/tstIprtMiniString.cpp

@@ -82 +82 @@
     CHECK(empty.length() == 0);
     CHECK(empty.capacity() == 0);
+
+    empty.reserve(1);
+    CHECK(empty.length() == 0);
+    CHECK(empty.capacity() == 1);
+    char *pszEmpty = empty.mutableRaw();
+    CHECK(pszEmpty != NULL);
 
     RTCString sixbytes("12345");