commit 3bf3b92dfab0ff449c557da0e64898199033e112
author Brian Osman <brianosman@google.com> Wed Feb 12 16:14:27 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 13 13:59:23 2020 +0000
tree 04f36459cc8e2e75d90c6a6b507619c246449801
parent 1d1333fcedf87274895eca681354e4790f5653d5

Guard runtime shader/colorfilter against SkSL that doesn't compile

Bug: oss-fuzz:20555
Bug: chromium:1051911
Change-Id: If40137e6cf3c0d398a86023c2399ddb7df10e209
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270442
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>

src/core/SkColorFilter.cpp

diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 468ff5c..27d8bee 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -491,6 +491,10 @@
     }
 
     auto effect = std::get<0>(SkRuntimeEffect::Make(std::move(sksl)));
+    if (!effect) {
+        return nullptr;
+    }
+
     return effect->makeColorFilter(std::move(inputs), children.data(), children.size());
 }
 

src/shaders/SkRTShader.cpp

diff --git a/src/shaders/SkRTShader.cpp b/src/shaders/SkRTShader.cpp
index f5158cd..f1a32ed 100644
--- a/src/shaders/SkRTShader.cpp
+++ b/src/shaders/SkRTShader.cpp
@@ -117,6 +117,10 @@
     }
 
     auto effect = std::get<0>(SkRuntimeEffect::Make(std::move(sksl)));
+    if (!effect) {
+        return nullptr;
+    }
+
     return effect->makeShader(std::move(inputs), children.data(), children.size(), localMPtr,
                               isOpaque);
 }