Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 10 insertions, 4 deletions

diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp
index 937bb505c9..0fb0e9ee33 100644
--- a/src/gui/painting/qcolorspace.cpp
+++ b/src/gui/painting/qcolorspace.cpp
@@ -422,6 +422,10 @@ QColorSpace::QColorSpace()
  */
 QColorSpace::QColorSpace(NamedColorSpace namedColorSpace)
 {
+    if (namedColorSpace < QColorSpace::SRgb || namedColorSpace > QColorSpace::ProPhotoRgb) {
+        qWarning() << "QColorSpace attempted constructed from invalid QColorSpace::NamedColorSpace: " << int(namedColorSpace);
+        return;
+    }
     static QColorSpacePrivate *predefinedColorspacePrivates[QColorSpace::ProPhotoRgb + 1];
     if (!predefinedColorspacePrivates[namedColorSpace]) {
         predefinedColorspacePrivates[namedColorSpace] = new QColorSpacePrivate(namedColorSpace);
@@ -784,10 +788,12 @@ QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace)
     QDebugStateSaver saver(dbg);
     dbg.nospace();
     dbg << "QColorSpace(";
-    if (colorSpace.d_ptr->namedColorSpace)
-        dbg << colorSpace.d_ptr->namedColorSpace << ", ";
-    dbg << colorSpace.primaries() << ", " << colorSpace.transferFunction();
-    dbg << ", gamma=" << colorSpace.gamma();
+    if (colorSpace.d_ptr) {
+        if (colorSpace.d_ptr->namedColorSpace)
+            dbg << colorSpace.d_ptr->namedColorSpace << ", ";
+        dbg << colorSpace.primaries() << ", " << colorSpace.transferFunction();
+        dbg << ", gamma=" << colorSpace.gamma();
+    }
     dbg << ')';
     return dbg;
 }