From 9abd557e2c718b02fc0a14999150e50508ff5f9a Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Mon, 26 Jan 2015 15:40:29 +0100
Subject: QQuickTextItem: fix crash on polishing

The "d->extra" pointer is lazily allocated, hence we must check if it's
valid before dereferencing it.

Task-number: QTBUG-44128
Change-Id: Id69c91e889193b0e9b73ed178c0ff3b13003227f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/quick/items/qquicktext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quick/items/qquicktext.cpp')

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index be86b2976b..51ae5ee93c 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2737,7 +2737,7 @@ void QQuickText::invalidateFontCaches()
 {
     Q_D(QQuickText);
 
-    if (d->richText && d->extra->doc != 0) {
+    if (d->richText && d->extra.isAllocated() && d->extra->doc != 0) {
         QTextBlock block;
         for (block = d->extra->doc->firstBlock(); block.isValid(); block = block.next()) {
             if (block.layout() != 0 && block.layout()->engine() != 0)
-- 
cgit v1.2.3