Index: src/sksl/SkSLParser.cpp |
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp |
index d011d46947066d2e55a3485d4203a870f5301e2e..2699d9c113d076dee0844196220ed0bff1734806 100644 |
--- a/src/sksl/SkSLParser.cpp |
+++ b/src/sksl/SkSLParser.cpp |
@@ -331,8 +331,9 @@ std::unique_ptr<ASTType> Parser::structDeclaration() { |
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) + "]"; |