Prevent expression evaluation data from overlapping

1 files changed, 11 insertions, 0 deletions

diff --git a/src/declarative/qml/qpodvector_p.h b/src/declarative/qml/qpodvector_p.h
index e74f9f6..77f7425 100644
--- a/src/declarative/qml/qpodvector_p.h
+++ b/src/declarative/qml/qpodvector_p.h
@@ -63,6 +63,7 @@ class QPODVector
 public:
     QPODVector()
     : m_count(0), m_capacity(0), m_data(0) {}
+    ~QPODVector() { if (m_data) ::free(m_data); } 
 
     const T &at(int idx) const {
         return m_data[idx];
@@ -122,6 +123,16 @@ public:
         return m_count;
     }
 
+    void copyAndClear(QPODVector<T> &other) {
+        if (other.m_data) ::free(other.m_data);
+        other.m_count = m_count;
+        other.m_capacity = m_capacity;
+        other.m_data = m_data;
+        m_count = 0;
+        m_capacity = 0;
+        m_data = 0;
+    }
+
     QPODVector<T> &operator<<(const T &v) { append(v); return *this; }
 private:
     QPODVector(const QPODVector &);