Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7

1 files changed, 11 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 1efd8cb714..cde2131aab 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -102,6 +102,7 @@ void Heap::String::init(MemoryManager *mm, String *l, String *r)
     stringHash = UINT_MAX;
     largestSubLength = qMax(l->largestSubLength, r->largestSubLength);
     len = l->len + r->len;
+    Q_ASSERT(largestSubLength <= len);
 
     if (!l->largestSubLength && l->len > largestSubLength)
         largestSubLength = l->len;
@@ -113,6 +114,15 @@ void Heap::String::init(MemoryManager *mm, String *l, String *r)
         simplifyString();
 }
 
+void Heap::String::destroy() {
+    if (!largestSubLength) {
+        mm->changeUnmanagedHeapSizeUsage(qptrdiff(-text->size) * (int)sizeof(QChar));
+        if (!text->ref.deref())
+            QStringData::deallocate(text);
+    }
+    Base::destroy();
+}
+
 uint String::toUInt(bool *ok) const
 {
     *ok = true;
@@ -151,7 +161,7 @@ void Heap::String::simplifyString() const
     text->ref.ref();
     identifier = 0;
     largestSubLength = 0;
-    mm->growUnmanagedHeapSizeUsage(size_t(text->size) * sizeof(QChar));
+    mm->changeUnmanagedHeapSizeUsage(qptrdiff(text->size) * (qptrdiff)sizeof(QChar));
 }
 
 void Heap::String::append(const String *data, QChar *ch)