From 4f1b6749c3f07bfa44b92f8261a03d650f54166b Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@theqtcompany.com>
Date: Wed, 2 Dec 2015 00:27:49 -0800
Subject: Fix possible null pointer dereferences.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This follows up 130c2baa9376dcf525916620294bd9996bdf41f3.

Change-Id: I2f6c9b4f995af427cec9a2162b782039debf8564
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
---
 src/gui/image/qicon.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/gui/image/qicon.cpp')

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index b2d9ed18f5..dc6cbfed1f 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1208,6 +1208,12 @@ bool QIcon::hasThemeIcon(const QString &name)
 */
 void QIcon::setIsMask(bool isMask)
 {
+    if (!d) {
+        d = new QIconPrivate;
+        d->engine = new QPixmapIconEngine;
+    } else {
+        detach();
+    }
     d->is_mask = isMask;
 }
 
@@ -1222,6 +1228,8 @@ void QIcon::setIsMask(bool isMask)
 */
 bool QIcon::isMask() const
 {
+    if (!d)
+        return false;
     return d->is_mask;
 }
 
-- 
cgit v1.2.3