commit dd4645b3051ab7944e5609b6d5ce9774d011bfbd
author ethannicholas <ethannicholas@google.com> Fri Oct 14 12:14:46 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 14 12:14:46 2016 -0700
tree c955bf248548fa4075c3f025cf97d71ee696feb9
parent d478a99f5c29f0e8fa64b50831f53232f5577f2d

another SkSL crash fix

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2420163002

Review-Url: https://codereview.chromium.org/2420163002

src/sksl/SkSLParser.cpp

diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index d011d46..2699d9c 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -331,8 +331,9 @@
         for (const auto& var : decl->fVars) {
             auto type = (const Type*) fTypes[decl->fType->fName];
             for (int i = (int) var.fSizes.size() - 1; i >= 0; i--) {
-                if (var.fSizes[i]->fKind != ASTExpression::kInt_Kind) {
+                if (!var.fSizes[i] || var.fSizes[i]->fKind != ASTExpression::kInt_Kind) {
                     this->error(decl->fPosition, "array size in struct field must be a constant");
+                    return nullptr;
                 }
                 uint64_t columns = ((ASTIntLiteral&) *var.fSizes[i]).fValue;
                 std::string name = type->name() + "[" + to_string(columns) + "]";