From 4dba08eebf7db7e801ccbf83dec6f17369123f10 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sun, 18 May 2014 17:45:45 +0300
Subject: [PATCH] Decrease the life time of SpecialData::resolvedFormats

Once LayoutData::items gets cleared, accessing (or re-using)
SpecialData::resolvedFormats may lead to a undefined behavior,
so clear SpecialData::resolvedFormats right after LayoutData::items.

Change-Id: Ib389f0029a0562f5d2837f62f76197510a0db099
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/gui/text/qtextengine.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index de7b42604ae..0928a223525 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1414,8 +1414,6 @@ void QTextEngine::invalidate()
     freeMemory();
     minWidth = 0;
     maxWidth = 0;
-    if (specialData)
-        specialData->resolvedFormats.clear();
 
     resetFontEngineCache();
 }
@@ -2357,6 +2355,8 @@ void QTextEngine::freeMemory()
         layoutData->haveCharAttributes = false;
         layoutData->items.clear();
     }
+    if (specialData)
+        specialData->resolvedFormats.clear();
     for (int i = 0; i < lines.size(); ++i) {
         lines[i].justified = 0;
         lines[i].gridfitted = 0;
@@ -2924,13 +2924,12 @@ public:
 
 void QTextEngine::resolveFormats() const
 {
-    if (!specialData || specialData->formats.isEmpty()
-        || !specialData->resolvedFormats.isEmpty())
+    if (!specialData || specialData->formats.isEmpty())
         return;
+    Q_ASSERT(specialData->resolvedFormats.isEmpty());
 
     QTextFormatCollection *collection = formatCollection();
 
-    specialData->resolvedFormats.clear();
     QVector<QTextCharFormat> resolvedFormats(layoutData->items.count());
 
     QVarLengthArray<int, 64> formatsSortedByStart;