AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for Fuzzer when AtoBType profiles are empty.

Browse Source 
When all A/B/M-curves, the matrix and the CLUT were not there it would
crash. There is now a check to avoid that. Past this point it should not
be an empty, as SkColorSpaceXform did not make such an assumption.

BUG=skia:6023

Change-Id: I099bcef7efac100d438a30bf59d9c170119b8545
Reviewed-on: https://skia-review.googlesource.com/5480
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Robert Aftias <raftias@google.com>
This commit is contained in:
raftias 2016-12-01 16:40:51 -05:00 committed by Skia Commit-Bot
parent 5e15961fa7
commit 2bb3592868
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/SkColorSpace_ICC.cpp
View File

@ -1233,8 +1233,12 @@ static bool load_a2b0(std::vector<SkColorSpace_A2B::Element>* elements, const ui
(type>>16)&0xFF, (type>>8)&0xFF, type&0xFF); (type>>16)&0xFF, (type>>8)&0xFF, type&0xFF);
return false; return false;
} }
SkASSERT(SkColorSpace_A2B::PCS::kLAB == pcs || SkColorSpace_A2B::PCS::kXYZ == pcs);
static constexpr int kPCSChannels = 3; // must be PCSLAB or PCSXYZ
if (elements->empty()) {
return kPCSChannels == icf_channels(inputColorFormat);
}
// now let's verify that the input/output channels of each A2B element actually match up // now let's verify that the input/output channels of each A2B element actually match up
SkASSERT(!elements->empty());
if (icf_channels(inputColorFormat) != elements->front().inputChannels()) { if (icf_channels(inputColorFormat) != elements->front().inputChannels()) {
SkColorSpacePrintf("Input channel count does not match first A2B element's input count"); SkColorSpacePrintf("Input channel count does not match first A2B element's input count");
return false; return false;
@ -1245,8 +1249,6 @@ static bool load_a2b0(std::vector<SkColorSpace_A2B::Element>* elements, const ui
return false; return false;
} }
} }
SkASSERT(SkColorSpace_A2B::PCS::kLAB == pcs || SkColorSpace_A2B::PCS::kXYZ == pcs);
static constexpr int kPCSChannels = 3; // must be PCSLAB or PCSXYZ
if (kPCSChannels != elements->back().outputChannels()) { if (kPCSChannels != elements->back().outputChannels()) {
SkColorSpacePrintf("PCS channel count doesn't match last A2B element's output count"); SkColorSpacePrintf("PCS channel count doesn't match last A2B element's output count");
return false; return false;