Changeset 37861 in vbox for trunk/include/VBox/com

Timestamp:

Jul 11, 2011 10:03:22 AM (14 years ago)

Author:

vboxsync

Message:

IPRT: fix assigning of empty lists

Location:

trunk/include/VBox/com

Files:

• list.h (modified) (3 diffs)
• mtlist.h (modified) (3 diffs)

trunk/include/VBox/com/list.h

@@ -131 +131 @@
     {
         com::SafeArray<IN_BSTR> sfaOther(ComSafeArrayInArg(other));
-        realloc_grow(sfaOther.size());
+        realloc(sfaOther.size());
         m_cSize = sfaOther.size();
         for (size_t i = 0; i < m_cSize; ++i)
@@ -148 +148 @@
      */
     RTCList(const com::SafeArray<IN_BSTR> &other)
+     : BASE(other.size())
     {
-        realloc_grow(other.size());
-        m_cSize = other.size();
         for (size_t i = 0; i < m_cSize; ++i)
             RTCListHelper<T, ITYPE>::set(m_pArray, i, T(other[i]));
@@ -168 +167 @@
         /* Values cleanup */
         RTCListHelper<T, ITYPE>::eraseRange(m_pArray, 0, m_cSize);
-
         /* Copy */
         if (other.size() != m_cCapacity)
-            realloc_grow(other.size());
+            realloc_no_elements_clean(other.size());
         m_cSize = other.size();
         for (size_t i = 0; i < other.size(); ++i)

trunk/include/VBox/com/mtlist.h

@@ -131 +131 @@
     {
         com::SafeArray<IN_BSTR> sfaOther(ComSafeArrayInArg(other));
-        realloc_grow(sfaOther.size());
+        realloc(sfaOther.size());
         m_cSize = sfaOther.size();
         for (size_t i = 0; i < m_cSize; ++i)
@@ -148 +148 @@
      */
     RTCMTList(const com::SafeArray<IN_BSTR> &other)
+      : BASE(other.size())
     {
-        realloc_grow(other.size());
-        m_cSize = other.size();
         for (size_t i = 0; i < m_cSize; ++i)
             RTCListHelper<T, ITYPE>::set(m_pArray, i, T(other[i]));
@@ -166 +165 @@
     {
         m_guard.enterWrite();
-        /* Values cleanup */
+         /* Values cleanup */
         RTCListHelper<T, ITYPE>::eraseRange(m_pArray, 0, m_cSize);
-
         /* Copy */
         if (other.size() != m_cCapacity)
-            realloc_grow(other.size());
+            realloc_no_elements_clean(other.size());
         m_cSize = other.size();
         for (size_t i = 0; i < other.size(); ++i)