Changeset 35567 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Jan 14, 2011 2:16:45 PM (14 years ago)

Author:

vboxsync

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

69451

Message:

IPRT: fix rare crash in MiniString::substr(); rename substr() to substrCP() and add a substr that operates on bytes, not codepoints; more to come

File:

• trunk/src/VBox/Runtime/common/string/ministring.cpp (modified) (2 diffs)

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

@@ -224 +224 @@
 }
 
-MiniString MiniString::substr(size_t pos /*= 0*/, size_t n /*= npos*/)
+MiniString MiniString::substrCP(size_t pos /*= 0*/, size_t n /*= npos*/)
     const
 {
@@ -256 +256 @@
 
                 size_t cbCopy = psz - pFirst;
-                ret.reserve(cbCopy + 1); // may throw bad_alloc
-#ifndef RT_EXCEPTIONS_ENABLED
-                AssertRelease(capacity() >= cbCopy + 1);
-#endif
-                memcpy(ret.m_psz, pFirst, cbCopy);
-                ret.m_cch = cbCopy;
-                ret.m_psz[cbCopy] = '\0';
+                if (cbCopy)
+                {
+                    ret.reserve(cbCopy + 1); // may throw bad_alloc
+#ifndef RT_EXCEPTIONS_ENABLED
+                    AssertRelease(capacity() >= cbCopy + 1);
+#endif
+                    memcpy(ret.m_psz, pFirst, cbCopy);
+                    ret.m_cch = cbCopy;
+                    ret.m_psz[cbCopy] = '\0';
+                }
             }
         }