commit 4dddad2bf8b5a53354d6134e596e6635d64c15a0
author Florin Malita <fmalita@chromium.org> Thu Aug 23 16:12:47 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 23 20:35:11 2018 +0000
tree fbfc2d6d41b3747e4e59d0b703cbc9bc34b29ce5
parent 906cdf3fcd3a746ac10bc7d0d19f24c5e8000513

[skottie] Guard against missing solid layer color property

Bug: skia:8281
Change-Id: I4a5d5e37d3b1bb0995c20ad138e8e234869ed760
Reviewed-on: https://skia-review.googlesource.com/148999
Commit-Queue: Florin Malita <fmalita@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Florin Malita <fmalita@chromium.org>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

modules/skottie/src/SkottieLayer.cpp

diff --git a/modules/skottie/src/SkottieLayer.cpp b/modules/skottie/src/SkottieLayer.cpp
index a796683..1b00ffd 100644
--- a/modules/skottie/src/SkottieLayer.cpp
+++ b/modules/skottie/src/SkottieLayer.cpp
@@ -267,6 +267,7 @@
     const skjson::StringValue* hex_str = jlayer["sc"];
     uint32_t c;
     if (size.isEmpty() ||
+        !hex_str ||
         *hex_str->begin() != '#' ||
         !SkParse::FindHex(hex_str->begin() + 1, &c)) {
         LogJSON(jlayer, "!! Could not parse solid layer");