Changeset 2230Tweet

Timestamp:

Jan 17, 2013, 11:19:30 PM (10 years ago)

Author:

sam

Message:

base: fix a nasty double free issue in Array::Remove().

Location:

trunk

Files:

• src/lol/base/array.h (modified) (2 diffs)
• test/unit/array.cpp (modified) (2 diffs)

trunk/src/lol/base/array.h

@@ -164 +164 @@
     void Remove(int pos, int todelete = 1)
     {
-        /* FIXME: we need to call dtors for the first
-         * todelete elements here */
         for (int i = pos; i + todelete < m_count; i++)
             m_data[i] = m_data[i + todelete];
@@ -183 +181 @@
         /* Not enough elements? Add some. */
         for (int i = m_count; i < count; ++i)
-            m_data[i] = e;
+            new(&m_data[i]) Element(e);
 
         m_count = count;

trunk/test/unit/array.cpp

@@ -18 +18 @@
 namespace lol
 {
+
+struct TrackedObj
+{
+    static int m_ctor, m_dtor;
+
+    TrackedObj() { m_ctor++; }
+    TrackedObj(TrackedObj const &) { m_ctor++; }
+    ~TrackedObj() { m_dtor++; }
+};
+
+int TrackedObj::m_ctor = 0;
+int TrackedObj::m_dtor = 0;
 
 LOLUNIT_FIXTURE(ArrayTest)
@@ -120 +132 @@
         LOLUNIT_ASSERT_EQUAL(b[3], 3);
     }
+
+    LOLUNIT_TEST(ElementCtorDtor)
+    {
+        /* Ensure array elements get created and destroyed the proper
+         * number of times. */
+        TrackedObj::m_ctor = 0;
+        TrackedObj::m_dtor = 0;
+        {
+            Array<TrackedObj> a;
+
+            a.Push(TrackedObj());
+        }
+        LOLUNIT_ASSERT_EQUAL(TrackedObj::m_ctor, TrackedObj::m_dtor);
+
+        TrackedObj::m_ctor = 0;
+        TrackedObj::m_dtor = 0;
+        {
+            Array<TrackedObj> a;
+
+            a.Resize(2);
+            a.Resize(4);
+            a.Resize(1);
+        }
+        LOLUNIT_ASSERT_EQUAL(TrackedObj::m_ctor, TrackedObj::m_dtor);
+    }
 };