Changeset 51887 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Utf8Str: Fix assignEx with a_offSrc != 0

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (5 diffs)
• src/VBox/Main/glue/string.cpp (modified) (3 diffs)

trunk/include/VBox/com/string.h

@@ -576 +576 @@
     HRESULT assignEx(Utf8Str const &a_rSrcStr)
     {
-        return copyFromExNComRC(a_rSrcStr.m_psz, a_rSrcStr.m_cch);
+        return copyFromExNComRC(a_rSrcStr.m_psz, 0, a_rSrcStr.m_cch);
     }
 
@@ -594 +594 @@
             || a_offSrc > a_rSrcStr.m_cch)
             return E_INVALIDARG;
-        return copyFromExNComRC(a_rSrcStr.m_psz, a_rSrcStr.m_cch);
+        return copyFromExNComRC(a_rSrcStr.m_psz, a_offSrc, a_cchSrc);
     }
 
@@ -606 +606 @@
     HRESULT assignEx(const char *a_pcszSrc)
     {
-        return copyFromExNComRC(a_pcszSrc, a_pcszSrc ? strlen(a_pcszSrc) : 0);
+        return copyFromExNComRC(a_pcszSrc, 0, a_pcszSrc ? strlen(a_pcszSrc) : 0);
     }
 
@@ -620 +620 @@
     HRESULT assignEx(const char *a_pcszSrc, size_t a_cchSrc)
     {
-        return copyFromExNComRC(a_pcszSrc, a_cchSrc);
+        return copyFromExNComRC(a_pcszSrc, 0, a_cchSrc);
     }
 
@@ -719 +719 @@
     void copyFrom(CBSTR a_pbstr);
     HRESULT copyFromEx(CBSTR a_pbstr);
-    HRESULT copyFromExNComRC(const char *a_pcszSrc, size_t a_cchSrc);
+    HRESULT copyFromExNComRC(const char *a_pcszSrc, size_t a_offSrc, size_t a_cchSrc);
 
     friend class Bstr; /* to access our raw_copy() */

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';
         }