From 41c854edad820e281097f6ba8f17ea89521155ea Mon Sep 17 00:00:00 2001
From: Mark Harmer <drivehappy@gmail.com>
Date: Tue, 14 Jun 2016 14:33:17 +0200
Subject: [Bug #1300865] lcms2: crash in Fill and Stroke if linked color
 profile is missing on local system.

Fixed bugs:
  - https://launchpad.net/bugs/1300865

(bzr r14987)
---
 src/color-profile.cpp                | 6 +++++-
 src/ui/widget/color-icc-selector.cpp | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 9e545df03..aea9ccab0 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -588,7 +588,11 @@ bool ColorProfile::GamutCheck(SPColor color)
         static_cast<guchar>(SP_RGBA32_G_U(val)),
         static_cast<guchar>(SP_RGBA32_B_U(val)),
         255};
-    cmsDoTransform(ColorProfile::getTransfGamutCheck(), &check_color, &outofgamut, 1);
+
+    cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();
+    if (gamutCheck) {
+        cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);
+    }
 
 #if HAVE_LIBLCMS1
     cmsSetAlarmCodes(alarm_r, alarm_g, alarm_b);
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index b422892fe..e4f58fe8a 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -633,9 +633,10 @@ void ColorICCSelectorImpl::_switchToProfile(gchar const *name)
 #endif // DEBUG_LCMS
                         tmp.set(SP_RGBA32_U_COMPOSE(pre[0], pre[1], pre[2], 0xff));
                     }
+
+                    dirty = true;
                 }
             }
-            dirty = true;
         }
     }
     else {
-- 
cgit v1.2.3