SkMergeImageFilter: fModes might be nullptr
authorMatt Sarett <msarett@google.com>
Tue, 25 Apr 2017 13:28:18 +0000 (09:28 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Tue, 25 Apr 2017 13:55:04 +0000 (13:55 +0000)
Bug:714994

Change-Id: Ib8349e8fc0aba455472035c9a4e873a1720b73e0
Reviewed-on: https://skia-review.googlesource.com/14267
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

src/effects/SkMergeImageFilter.cpp

index 546d66a..e7c3f51 100644 (file)
@@ -148,7 +148,7 @@ sk_sp<SkImageFilter> SkMergeImageFilter::onMakeColorSpace(SkColorSpaceXformer* x
     SkSTArray<5, SkBlendMode> modes(this->countInputs());
     for (int i = 0; i < this->countInputs(); i++) {
         inputs.push_back(this->getInput(i) ? this->getInput(i)->makeColorSpace(xformer) : nullptr);
-        modes.push_back((SkBlendMode) fModes[i]);
+        modes.push_back(fModes ? (SkBlendMode) fModes[i] : SkBlendMode::kSrcOver);
     }
 
     return SkMergeImageFilter::MakeN(inputs.begin(), this->countInputs(), modes.begin(),