Changeset 51887 in vbox for trunk/src

Timestamp:

Jul 6, 2014 7:35:16 PM (11 years ago)

Author:

vboxsync

Message:

Utf8Str: Fix assignEx with a_offSrc != 0

File:

• trunk/src/VBox/Main/glue/string.cpp (modified) (3 diffs)

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

@@ -247 +247 @@
  *
  * @param   a_pcszSrc   The source string.
+ * @param   a_offSrc    Start offset to copy from.
  * @param   a_cchSrc    The source string.
  * @returns S_OK or E_OUTOFMEMORY.
@@ -253 +254 @@
  *          code space.)
  */
-HRESULT Utf8Str::copyFromExNComRC(const char *a_pcszSrc, size_t a_cchSrc)
+HRESULT Utf8Str::copyFromExNComRC(const char *a_pcszSrc, size_t a_offSrc, size_t a_cchSrc)
 {
     cleanup();
@@ -263 +264 @@
             m_cch = a_cchSrc;
             m_cbAllocated = a_cchSrc + 1;
-            memcpy(m_psz, a_pcszSrc, a_cchSrc);
+            memcpy(m_psz, a_pcszSrc + a_offSrc, a_cchSrc);
             m_psz[a_cchSrc] = '\0';
         }