r20869 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 1 22:43:23 UTC 2016
Author: craig
Date: Mon Feb 1 22:43:23 2016
New Revision: 20869
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20869
Log:
coverity #1350184: dereference after null check, and fix an && vs & bug as well
Modified:
trunk/Scribus/scribus/sccolorengine.cpp
Modified: trunk/Scribus/scribus/sccolorengine.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20869&path=/trunk/Scribus/scribus/sccolorengine.cpp
==============================================================================
--- trunk/Scribus/scribus/sccolorengine.cpp (original)
+++ trunk/Scribus/scribus/sccolorengine.cpp Mon Feb 1 22:43:23 2016
@@ -562,7 +562,7 @@
ScColorTransform trans = doc ? doc->stdLabToRGBTrans : ScCore->defaultLabToRGBTrans;
ScColorTransform transProof = doc ? doc->stdProofLab : ScCore->defaultLabToRGBTrans;
ScColorTransform transProofGC = doc ? doc->stdProofLabGC : ScCore->defaultLabToRGBTrans;
- if (cmsUse & doc->SoftProofing)
+ if (cmsUse && doc && doc->SoftProofing)
{
ScColorTransform xform = doGC ? transProofGC : transProof;
xform.apply(inC, outC, 1);
More information about the scribus-commit
mailing list